Index: results/.gitignore
===================================================================
diff -u -r2d5157c59ced0866aaa32d9722d6f1ba28b0b18d -re254c20e850be27e0f21c33bed1a80c8f0e62dd5
--- results/.gitignore	(.../.gitignore)	(revision 2d5157c59ced0866aaa32d9722d6f1ba28b0b18d)
+++ results/.gitignore	(.../.gitignore)	(revision e254c20e850be27e0f21c33bed1a80c8f0e62dd5)
@@ -1,5 +1,6 @@
 *.html
-<<<<<<< HEAD
+*.csv
+*.log
 
-=======
->>>>>>> DEN-4308-hd-valve-control-1-of-2
+# Ignore all the subdirectories in the results folder
+results/**
Fisheye: Tag e254c20e850be27e0f21c33bed1a80c8f0e62dd5 refers to a dead (removed) revision in file `results/Build_Status_Report.csv'.
Fisheye: No comparison available.  Pass `N' to diff?