aboutsummaryrefslogtreecommitdiffstats
path: root/mandrake_desk.spec
diff options
context:
space:
mode:
Diffstat (limited to 'mandrake_desk.spec')
-rw-r--r--mandrake_desk.spec1
1 files changed, 0 insertions, 1 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.