X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Fselectors%2F177b-expected.txt;h=1af3ccf3fc8472dda5a70c5f4efd53ce4a75cfef;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=8d7c43c5b21911767d37082744bc402028579f5e;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/selectors/177b-expected.txt b/LayoutTests/platform/efl/fast/selectors/177b-expected.txt
index 8d7c43c..1af3ccf 100755
--- a/LayoutTests/platform/efl/fast/selectors/177b-expected.txt
+++ b/LayoutTests/platform/efl/fast/selectors/177b-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x38
   RenderBlock {HTML} at (0,0) size 800x38
     RenderBody {BODY} at (8,12) size 784x14
@@ -7,3 +8,12 @@ layer at (0,0) size 800x38
         RenderBlock {P} at (0,0) size 784x14
           RenderText {#text} at (0,0) size 122x14
             text run at (0,0) width 122: "This line should be green."
+=======
+layer at (0,0) size 800x51
+  RenderBlock {HTML} at (0,0) size 800x51
+    RenderBody {BODY} at (8,16) size 784x19
+      RenderBlock {DIV} at (0,0) size 784x19 [color=#008000]
+        RenderBlock {P} at (0,0) size 784x19
+          RenderText {#text} at (0,0) size 163x19
+            text run at (0,0) width 163: "This line should be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d