[Pkg-owncloud-commits] [php-sabre-vobject] 17/43: Fixed CHANGELOG

[David Prévot]

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

taffit pushed a commit to tag 4.0.0-alpha2
in repository php-sabre-vobject.

commit 87c6a50dd93506784ac70ac228e62ef93f0db262
Author: Dominik <DominikTo at users.noreply.github.com>
Date:   Mon Jul 20 22:32:16 2015 +0200

    Fixed CHANGELOG
---
 CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff17457..47dbb67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,12 +37,8 @@ ChangeLog
 * #197: The `$children` property on components has been changed from `public`
   to `protected`. Use the `children()` method instead to get a flat list of
   objects.
-<<<<<<< HEAD
-
-=======
 * #244: The `Float` and `Integer` classes have been renamed to `FloatValue`
   and `IntegerValue` to allow PHP 7 compatibility.
->>>>>>> master
 
 
 3.4.5 (2015-06-02)

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