Index: results/.gitignore
===================================================================
diff -u -r1375b56bfeb3f458644484d9fe4f2e75e1289e38 -r2d5157c59ced0866aaa32d9722d6f1ba28b0b18d
--- results/.gitignore	(.../.gitignore)	(revision 1375b56bfeb3f458644484d9fe4f2e75e1289e38)
+++ results/.gitignore	(.../.gitignore)	(revision 2d5157c59ced0866aaa32d9722d6f1ba28b0b18d)
@@ -1 +1,5 @@
 *.html
+<<<<<<< HEAD
+
+=======
+>>>>>>> DEN-4308-hd-valve-control-1-of-2