killed leftover conflict marks
authorMartin Vidner <mvidner@suse.cz>
Mon, 16 Oct 2006 13:24:24 +0000 (13:24 +0000)
committerMartin Vidner <mvidner@suse.cz>
Mon, 16 Oct 2006 13:24:24 +0000 (13:24 +0000)
commite98d0b19e6f8b09ee3518054ba9d38beced2b3bf
treeb9eba7213d6f6f10256f8da5cdf976f768c56fe6
parent34de7ce4b84f6c090ec5e0feda6a6f9d10a648ae
killed leftover conflict marks
package/libzypp.changes