New commits:
commit 6f80502ee42567cfbea33f868bd05b781f3f900c
Author: Karsten "BearPerson" Behrmann <karsten AT homebase.bearperson.de>
Commit: Karsten "BearPerson" Behrmann <karsten AT homebase.bearperson.de>
remove merge tag
diff --git a/iso/usr/share/doc/smgl.install/steps/user-setup
b/iso/usr/share/doc/smgl.install/steps/user-setup
index e7315f7..8a5e48e 100644
--- a/iso/usr/share/doc/smgl.install/steps/user-setup
+++ b/iso/usr/share/doc/smgl.install/steps/user-setup
@@ -12,7 +12,6 @@ forget. Also, bear in mind that it can be bypassed with a
screwdriver.):
If you would like to add additional users at this time, you may feel free
to do so by typing the following:
-<<<<<<< HEAD:iso/usr/share/doc/smgl.install/steps/user-setup
[1museradd -d /home/mbolton -m [m-g users[1m mbolton[m
[1mpasswd mbolton[m
[SM-Commit] GIT changes to master cauldron by Karsten "BearPerson" Behrmann (6f80502ee42567cfbea33f868bd05b781f3f900c),
Karsten BearPerson Behrmann, 03/22/2008