fix merge artefact

yast · Apr 7, 2017 · a6bc7b7 · a6bc7b7
1 parent 042a742
commit a6bc7b7
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -94,7 +94,6 @@ Mon Mar  6 09:39:00 UTC 2017 - mfilka@suse.com
   - update all-in-one's subdialog (network/kdump/partitioning/...)
     overview when the dialog is closed and do not lose another
     content already entered by user.
->>>>>>> master
 - 3.2.24
 
 -------------------------------------------------------------------