Fix bad merge procedure

29bc7186 · Cédric de Saint Martin · b4a7d6b1 · 29bc7186
Commit 29bc7186 authored Sep 17, 2012 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

slapos/tests/slapgrid.py slapos/tests/slapgrid.py +0 -7

No files found.
--- a/slapos/tests/slapgrid.py
+++ b/slapos/tests/slapgrid.py
@@ -1170,17 +1170,10 @@ fi""" % {'worked_file': worked_file, 'lockfile': lockfile})
      with open(promise, 'w') as f:
        f.write("""#!/usr/bin/env sh
 touch "%(worked_file)s"
-<<<<<<< HEAD
 if [ ! -f %(lockfile)s ]
 then
  touch "%(lockfile)s"
 else
-=======
-if [ ! -f %(lockfile)s ] 
-then
-  touch "%(lockfile)s" 
-else 
->>>>>>> master
  sleep 5
 fi
 exit 0"""  % {'worked_file': worked_file, 'lockfile': lockfile})