projects
/
framework
/
web
/
webkit-efl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tizen beta release
[framework/web/webkit-efl.git]
/
LayoutTests
/
platform
/
efl
/
fast
/
dynamic
/
009-expected.txt
diff --git
a/LayoutTests/platform/efl/fast/dynamic/009-expected.txt
b/LayoutTests/platform/efl/fast/dynamic/009-expected.txt
index
f90164f
..
2a786ad
100755
(executable)
--- a/
LayoutTests/platform/efl/fast/dynamic/009-expected.txt
+++ b/
LayoutTests/platform/efl/fast/dynamic/009-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
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
RenderBlock {DIV} at (0,0) size 784x14
RenderText {#text} at (0,0) size 127x14
text run at (0,0) width 127: "This text should be visible."
RenderBlock {DIV} at (0,0) size 784x14
RenderText {#text} at (0,0) size 127x14
text run at (0,0) width 127: "This text should be visible."
+=======
+ RenderBlock {DIV} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 169x19
+ text run at (0,0) width 169: "This text should be visible."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d