merge conflict

yast · Jul 7, 2016 · f2c7fdb · f2c7fdb
1 parent 794b7be
commit f2c7fdb
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -59,7 +59,6 @@ Fri Jun  3 15:22:02 UTC 2016 - igonzalezsosa@suse.com
 - Fix AutoYaST2 schema regarding SSH keys/configuration import
   feature (fate#319624)
 - Stop generating autodocs (fate#320356)
->>>>>>> master
 - 3.1.130
 
 -------------------------------------------------------------------