From: Michael Andres <ma@suse.de>
Date: Wed, 29 Jan 2014 11:41:45 +0000 (+0100)
Subject: changes
X-Git-Tag: upstream/1.11.11~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=310b40ac8e229bab028af0816d3bc071ff74de0c;p=platform%2Fupstream%2Fzypper.git

changes
---

diff --git a/package/zypper.changes b/package/zypper.changes
index 057a6a0..735ea43 100644
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -3,6 +3,7 @@ Wed Jan 29 10:57:54 CET 2014 - ma@suse.de
 
 - Don't treat missing packages due to download mode as error in 
   fileconflict check.
+- Add --replacefiles option to resolve file conflicts (bnc#673720)
 - version 1.10.4
 
 -------------------------------------------------------------------