git://git.webkit.org / WebKit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 321d760)
Remove stray conflict marker.
authormjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Dec 2009 03:43:31 +0000 (03:43 +0000)
committermjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Dec 2009 03:43:31 +0000 (03:43 +0000)
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51887 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog patch | blob | history

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b8ae51fe95abf3c33c6c3be27d59da69e9593417..5a6e3ebb13b15a8b2614fe0a7e6705965821e9b9 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -50,7 +50,6 @@
         (WTF::RefCountedBase::derefBase):
         * wtf/ThreadVerifier.h: Removed.
 
->>>>>>> .r51879
 2009-12-08  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 
         Reviewed by Darin Adler.
Mirror of the WebKit open source project on svn.webkit.org.