Reviewed by.
authorkmccullo <kmccullo@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2006 02:47:32 +0000 (02:47 +0000)
committerkmccullo <kmccullo@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2006 02:47:32 +0000 (02:47 +0000)
        - Removed a confilct marker

        * ChangeLog:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@18054 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

index 8225dcfa0f293cb775b39e7711c1ca615bb82b92..08e34987a9846fb821875d628f7a365d7017ff2a 100644 (file)
@@ -1,3 +1,11 @@
+2006-12-06  Kevin McCullough  <KMcCullough@apple.com>
+
+        Reviewed by.
+
+        - Removed a confilct marker
+
+        * ChangeLog:
+
 2006-12-06  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by darin