Merge branch 'dfsg-orig' into dfsg-debian

[tar] / cleanup-script.sh

diff --git a/cleanup-script.sh b/cleanup-script.sh
index 39fd20beb1112cb87de9235d64b88648cc525827..1fd7d47b90cd3d6bff24d4285dcf9f9af25e2c14 100755 (executable)
--- a/cleanup-script.sh
+++ b/cleanup-script.sh
@@ -4,6 +4,7 @@
 #      Copyright 2009 by Bdale Garbee.  GPL v2 or any later version.
 #
 
+git rm -rf doc
 rm -rf doc
 
 # This is a shell archive (produced by GNU sharutils 4.6.3).
@@ -217,4 +218,10 @@ 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