Title: [168337] branches/safari-537.76-branch/LayoutTests/ChangeLog
- Revision
- 168337
- Author
- [email protected]
- Date
- 2014-05-05 18:10:06 -0700 (Mon, 05 May 2014)
Log Message
Remove merge artifact.
Modified Paths
Diff
Modified: branches/safari-537.76-branch/LayoutTests/ChangeLog (168336 => 168337)
--- branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-05-06 01:03:26 UTC (rev 168336)
+++ branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-05-06 01:10:06 UTC (rev 168337)
@@ -364,7 +364,6 @@
* fast/forms/form-submission-crash-successful-submit-button-expected.txt: Added.
* fast/forms/form-submission-crash-successful-submit-button.html: Added.
->>>>>>> .r168067
2014-04-29 Matthew Hanson <[email protected]>
Merge r160010.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
