Reviewed by Hyatt.

        - fix layout test editing/style/table-selection.html

        * editing/style/table-selection-expected.txt: Updated selection delegate output.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 883b6e8..d1e0348 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 2007-05-30  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Hyatt.
@@ -7,7 +6,6 @@
 
         * editing/style/table-selection-expected.txt: Updated selection delegate output.
 
-=======
 2007-05-30  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Oliver.
@@ -72,7 +70,6 @@
         * fast/dom/Window/window-properties-expected.txt: adds new constructors
         * fast/dom/wrapper-classes-expected.txt: CSSStyleRule now passes!!
 
->>>>>>> .r21912
 2007-05-30  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Mitz.