[Pkg-owncloud-commits] [php-sabredav] 22/29: Fixed bad after-conflict commit.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit d24035a9bfaac0384b244ba7ad0c233169b5eef4
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jun 27 21:42:58 2016 -0400

    Fixed bad after-conflict commit.
---
 CHANGELOG.md | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0441b53..4a9c1c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,25 +17,6 @@ ChangeLog
   in between versions.
 
 
-3.1.5 (????-??-??)
-------------------
-
-* Fixed: Creating a new calendar on some MySQL configurations caused an error.
-
-
-3.1.4 (2016-05-28)
-------------------
-
-* #834: Backport from `master`: Return vCards exactly as they were stored if
-  we don't need to convert in between versions. This should speed up many
-  large addressbook syncs sometimes up to 50%.
->>>>>>> 3.1
-* The zip release ships with [sabre/vobject 4.1.0][vobj],
-  [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
-  [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.2][xml].
-
-
-<<<<<<< HEAD
 3.2.0-alpha1 (2016-05-09)
 -------------------------
 
@@ -97,8 +78,23 @@ ChangeLog
   [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.1][xml].
 
 
-=======
->>>>>>> 3.1
+3.1.5 (????-??-??)
+------------------
+
+* Fixed: Creating a new calendar on some MySQL configurations caused an error.
+
+
+3.1.4 (2016-05-28)
+------------------
+
+* #834: Backport from `master`: Return vCards exactly as they were stored if
+  we don't need to convert in between versions. This should speed up many
+  large addressbook syncs sometimes up to 50%.
+* The zip release ships with [sabre/vobject 4.1.0][vobj],
+  [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
+  [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.2][xml].
+
+
 3.1.3 (2016-04-06)
 ------------------
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-php/php-sabredav.git