Title: [195855] trunk/LayoutTests/ChangeLog
- Revision
- 195855
- Author
- beid...@apple.com
- Date
- 2016-01-29 15:31:59 -0800 (Fri, 29 Jan 2016)
Log Message
Finish getting rid of those conflict markers.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (195854 => 195855)
--- trunk/LayoutTests/ChangeLog 2016-01-29 23:30:24 UTC (rev 195854)
+++ trunk/LayoutTests/ChangeLog 2016-01-29 23:31:59 UTC (rev 195855)
@@ -149,7 +149,6 @@
* js/regress/v8-raytrace-with-try-catch-high-frequency-throws-expected.txt: Added.
* js/regress/v8-raytrace-with-try-catch-high-frequency-throws.html: Added.
->>>>>>> .r195836
2016-01-29 Carlos Alberto Lopez Perez <clo...@igalia.com>
[GTK] Unreviewed gardening after r195740 (v2).
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
