layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
+<<<<<<< HEAD
layer at (0,0) size 800x168
RenderBlock {HTML} at (0,0) size 800x168
RenderBody {BODY} at (8,12) size 784x144 [color=#FF0000]
RenderBlock {P} at (0,130) size 784x14 [color=#008000]
RenderText {#text} at (0,0) size 122x14
text run at (0,0) width 122: "This line should be green."
+=======
+layer at (0,0) size 800x226
+ RenderBlock {HTML} at (0,0) size 800x226
+ RenderBody {BODY} at (8,16) size 784x194 [color=#FF0000]
+ RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+ RenderText {#text} at (0,0) size 163x19
+ text run at (0,0) width 163: "This line should be green."
+ RenderBlock {P} at (0,35) size 784x19 [color=#008000]
+ RenderText {#text} at (0,0) size 163x19
+ text run at (0,0) width 163: "This line should be green."
+ RenderBlock {P} at (0,70) size 784x19 [color=#008000]
+ RenderText {#text} at (0,0) size 163x19
+ text run at (0,0) width 163: "This line should be green."
+ RenderBlock {P} at (0,105) size 784x19 [color=#008000]
+ RenderText {#text} at (0,0) size 163x19
+ text run at (0,0) width 163: "This line should be green."
+ RenderBlock {P} at (0,140) size 784x19 [color=#008000]
+ RenderText {#text} at (0,0) size 163x19
+ text run at (0,0) width 163: "This line should be green."
+ RenderBlock {P} at (0,175) size 784x19 [color=#008000]
+ RenderText {#text} at (0,0) size 163x19
+ text run at (0,0) width 163: "This line should be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d