Title: [195853] trunk/LayoutTests/ChangeLog
- Revision
- 195853
- Author
- beid...@apple.com
- Date
- 2016-01-29 15:30:09 -0800 (Fri, 29 Jan 2016)
Log Message
Get rid of conflit markers added to ChangeLog in r195837
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (195852 => 195853)
--- trunk/LayoutTests/ChangeLog 2016-01-29 23:28:56 UTC (rev 195852)
+++ trunk/LayoutTests/ChangeLog 2016-01-29 23:30:09 UTC (rev 195853)
@@ -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 <bfulg...@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 <ryanhad...@apple.com>
Rebaseline fast/forms tests after r195700
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
