Get rid of conflit markers added to ChangeLog in r195837
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Jan 2016 23:30:09 +0000 (23:30 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Jan 2016 23:30:09 +0000 (23:30 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195853 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

index 5ca09e0..65af9af 100644 (file)
@@ -37,7 +37,6 @@
         * storage/domstorage/localstorage/delete-defineproperty-removal-expected.txt: Added.
         * storage/domstorage/localstorage/delete-defineproperty-removal.html: Added.
 
-<<<<<<< .mine
 2016-01-29  Brent Fulgham  <bfulgham@apple.com>
 
         [WebGL] Check vertex array bounds before permitting a glDrawArrays to execute
@@ -49,7 +48,6 @@
         * fast/canvas/webgl/webgl-drawarrays-crash-expected.txt: Added.
         * fast/canvas/webgl/webgl-drawarrays-crash.html: Added.
 
-=======
 2016-01-29  Ryan Haddad  <ryanhaddad@apple.com>
 
         Rebaseline fast/forms tests after r195700