Finish getting rid of those conflict markers.
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Jan 2016 23:31:59 +0000 (23:31 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Jan 2016 23:31:59 +0000 (23:31 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195855 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

index 65af9af..c57495a 100644 (file)
         * 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  <clopez@igalia.com>
 
         [GTK] Unreviewed gardening after r195740 (v2).