projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
honor dpkg-buildflags and DEB_BUILD_OPTIONS better, #727196
[debian/tar]
/
cleanup-script.sh
diff --git
a/cleanup-script.sh
b/cleanup-script.sh
index 1fd7d47b90cd3d6bff24d4285dcf9f9af25e2c14..da84ad79c83fed61932bd0602d3b858cc787a991 100755
(executable)
--- 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
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
git add doc/Makefile doc/Makefile.in doc/README
->>>>>>> c286dbf484dc985fb63d5c677fc8cd91b5b1d0f6:cleanup-script.sh
exit 0
exit 0
+