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