Commit 18a9d5e4 authored by ddkilzer's avatar ddkilzer

Remove conflict markers.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@21713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 66430b86
<<<<<<< .mine
2007-05-23 Mitz Pettel <mitz@webkit.org>
Reviewed by David Hyatt.
......@@ -11,7 +10,6 @@
* fast/css/stale-style-selector-crash-2-expected.txt: Added.
* fast/css/stale-style-selector-crash-2.html: Added.
=======
2007-05-23 Darin Adler <darin@apple.com>
Reviewed by Hyatt.
......@@ -34,7 +32,6 @@
* fast/dom/prototype-chain-expected.txt:
* fast/dom/prototype-chain.html:
>>>>>>> .r21688
2007-05-23 Kevin McCullough <kmccullough@apple.com>
Reviewed by Darin.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment