X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Ftext%2Fbasic%2F003-expected.txt;h=f3fb60b1bab2cf1c78bbfe9c8d20bbdc41bcc109;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=c0d2ab0bd67cfecdaf972c93c2e65e764c154acf;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/text/basic/003-expected.txt b/LayoutTests/platform/efl/fast/text/basic/003-expected.txt
index c0d2ab0..f3fb60b 100755
--- a/LayoutTests/platform/efl/fast/text/basic/003-expected.txt
+++ b/LayoutTests/platform/efl/fast/text/basic/003-expected.txt
@@ -3,6 +3,12 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderBlock (floating) {P} at (0,12) size 656x18 [border: (2px solid #0000FF)]
         RenderText {#text} at (2,2) size 652x14
           text run at (2,2) width 652: "There should be 12px of letter spacing."
+=======
+      RenderBlock (floating) {P} at (0,16) size 718x23 [border: (2px solid #0000FF)]
+        RenderText {#text} at (2,2) size 714x19
+          text run at (2,2) width 714: "There should be 12px of letter spacing."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d