Clean up merge conflicts in RPM spec file changelogs

Author: bjornmu

packaging/rpm-fedora/mysql.spec.in

@@ -724,12 +724,12 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
 
 %changelog
+* Mon Oct 31 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.35-1
+- Add connection_control.so to server subpackage
+
 * Mon Sep 26 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.34-1
 - Include mysql-files directory
 
-* Tue Sep 13 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.34-1
-- Add connection_control.so to server subpackage
-
 * Tue Jul 05 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.32-1
 - Remove mysql_config from client subpackage
 

packaging/rpm-oel/mysql.spec.in

@@ -956,13 +956,12 @@ fi
 %endif
 
 %changelog
-<<<<<<< ours
+* Mon Oct 31 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.35-1
+- Add connection_control.so to server subpackage
+
 * Mon Sep 26 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.34-1
 - Include mysql-files directory
 
-* Tue Sep 13 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.34-1
-- Add connection_control.so to server subpackage
-
 * Tue Jul 05 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.32-1
 - Remove mysql_config from client subpackage
 

packaging/rpm-sles/mysql.spec.in

@@ -826,13 +826,12 @@ fi
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
 
 %changelog
-<<<<<<< ours
+* Mon Oct 31 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.35-1
+- Add connection_control.so to server subpackage
+
 * Mon Sep 26 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.34-1
 - Include mysql-files directory
 
-* Tue Sep 13 2016 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.34-1
-- Add connection_control.so to server subpackage
-
 * Mon Mar 14 2016 Georgi Kodinov <georgi.kodinov@oracle.com> - 5.6.31-1
 - Add test_udf_services.so plugin