Fixed merging changes

yast · Apr 21, 2017 · 2ca03a4 · 2ca03a4
1 parent c62ae73
commit 2ca03a4
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,42 +1,38 @@
 -------------------------------------------------------------------
-Fri Apr 21 11:08:15 UTC 2017 - ancor@suse.com
+Fri Apr 21 11:24:52 UTC 2017 - lslezak@suse.cz
 
 - Synced storage-ng and master branches. See changes below.
-- 3.3.3
+- 3.3.4
+
 -------------------------------------------------------------------
 Fri Apr  7 13:40:59 UTC 2017 - lslezak@suse.cz
 
 - Create the /etc/products.d/baseproduct symlink in inst-sys when
   it is missing to allow expanding variables in the add-on
   repositories URL (bsc#972046)
-- 3.2.22
 
 -------------------------------------------------------------------
 Tue Mar 28 08:31:49 UTC 2017 - igonzalezsosa@suse.com
 
 - Do not crash when changing the priority of a just created
   repository (bsc#1027111)
-- 3.2.21
 
 -------------------------------------------------------------------
 Mon Mar 27 08:42:41 UTC 2017 - mvidner@suse.com
 
 - Do not ignore solver problems after touching the partitioning
   (bsc#1029306)
-- 3.2.20
 
 -------------------------------------------------------------------
 Fri Mar 24 16:17:23 UTC 2017 - lslezak@suse.cz
 
 - Download the addon y2update.tgz file from a package referenced
   by the "installerextension()" provides dependency (FATE#320772)
-- 3.2.19
 
 -------------------------------------------------------------------
 Mon Mar 20 12:33:35 UTC 2017 - jreidinger@suse.com
 
 - make minimal changes when modify zypp.conf (bsc#1023204)
-- 3.2.18
 
 -------------------------------------------------------------------
 Tue Mar  7 09:37:15 CET 2017 - schubi@suse.de
@@ -49,7 +45,12 @@ Tue Mar  7 09:37:15 CET 2017 - schubi@suse.de
   product will not be installed because SLES_SAP already includes
   the SLES product.
   (bnc#1014861)
-- 3.2.17
+
+-------------------------------------------------------------------
+Fri Mar  3 16:42:50 UTC 2017 - ancor@suse.com
+
+- Synced storage-ng and master branches. See changes below.
+- 3.3.3
 
 -------------------------------------------------------------------
 Wed Feb  8 14:40:29 UTC 2017 - jreidinger@suse.com