aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mandrake_desk.spec1
-rw-r--r--window-managers2
2 files changed, 1 insertions, 2 deletions
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 8ef2970..16c66f7 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -75,7 +75,6 @@ rm -rf $RPM_BUILD_ROOT
* Tue Dec 23 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
- included the mandrake.links* files formerly in gmc package
->>>>>>> 1.11
* Wed Dec 22 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
- sbin/fndSession: new script with the new chksession.
- sbin/chksession: a new greatest hit.
diff --git a/window-managers b/window-managers
index ef3bf30..dbaa3ae 100644
--- a/window-managers
+++ b/window-managers
@@ -59,7 +59,7 @@ DESC=A Light Window-Manager
SCRIPT:
exec /usr/X11R6/bin/icewm
--@@--
-NAME=Fvwm1
+NAME=Fvwm1
EXEC=/usr/X11R6/bin/fvwm
DESC=A very stable and light window manager
SCRIPT: