From e98d0b19e6f8b09ee3518054ba9d38beced2b3bf Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Mon, 16 Oct 2006 13:24:24 +0000 Subject: [PATCH] killed leftover conflict marks --- package/libzypp.changes | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index c16170b..f7b9ff4 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -4,8 +4,7 @@ Mon Oct 16 15:02:00 CEST 2006 - jkupec@suse.cz - zypper: added case-sensitive search, search in descriptions and summaries, search by resolvable type, substring and word matching, support for wildcards - -Revision 4303 +- Revision 4303 ------------------------------------------------------------------- Mon Oct 16 12:57:56 CEST 2006 - schubi@suse.de @@ -26,7 +25,6 @@ Mon Oct 16 13:27:50 CEST 2006 - mvidner@suse.cz (#211286). ------------------------------------------------------------------- ->>>>>>> .r4303 Fri Oct 13 16:51:43 CEST 2006 - dmacvicar@suse.de - implement rename source in sourcemanager -- 2.7.4