remove merge conflict relict

yast · Sep 4, 2014 · af1511c · af1511c
1 parent 845d086
commit af1511c
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -74,7 +74,6 @@ Tue Jul 29 15:52:43 UTC 2014 - lslezak@suse.cz
 
 - ag_zypp_repos - do not try parsing directory entries in
   /etc/zypp/repos.d/, that leads to invalid values (bnc#867911)
->>>>>>> 8fe56169bbc38ed8822ac5eb9eaf7f9ca5f413f9
 - 3.1.35
 
 -------------------------------------------------------------------