X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=cleanup-script.sh;h=da84ad79c83fed61932bd0602d3b858cc787a991;hb=5304f9b45f6ad48a0dbc8a39bbbf33fb9944cf65;hp=1fd7d47b90cd3d6bff24d4285dcf9f9af25e2c14;hpb=d3daaa199aca7497bb507f92b693c8457353f96a;p=debian%2Ftar

diff --git a/cleanup-script.sh b/cleanup-script.sh
index 1fd7d47b..da84ad79 100755
--- a/cleanup-script.sh
+++ b/cleanup-script.sh
@@ -218,10 +218,8 @@ then ${echo} 'x - removed lock directory `'${lock_dir}\''.'
 else ${echo} 'x - failed to remove lock directory `'${lock_dir}\''.'
   exit 1
 fi
-<<<<<<< HEAD:cleanup-script.sh
-=======
 
 git add doc/Makefile doc/Makefile.in doc/README
 
->>>>>>> c286dbf484dc985fb63d5c677fc8cd91b5b1d0f6:cleanup-script.sh
 exit 0
+