Fixed CHANGELOG

fruux · Jul 20, 2015 · 87c6a50 · 87c6a50
1 parent 0d1e240
commit 87c6a50
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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)