From 5641f1914c8b1ca4bbdeb48c17e3ca82ae4ad24b Mon Sep 17 00:00:00 2001
From: Chmouel Boudjnah <chmouel@mandriva.org>
Date: Sat, 25 Dec 1999 19:13:58 +0000
Subject: "Seethechangelog"

---
 mandrake_desk.spec | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mandrake_desk.spec')

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.
-- 
cgit v1.2.1