# 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).
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