Fixed a mistake in dockerfile

wawhal · wawhal · commit a1a3116de9fc · 2017-09-01T04:03:16.000+05:30
diff --git a/haskell-spock/build/Dockerfile b/haskell-spock/build/Dockerfile
@@ -1,4 +1,9 @@
 FROM scratch
 COPY rootfs/ /
 
-CMD haskell-spock
+<<<<<<< HEAD
+CMD haskell-spock
+=======
+#CMD haskell-spock
+#Add your own binary name here to run that command by default
+>>>>>>> 631bed093e3770953317dbbcf42770de7e3ef7f7
