layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
+<<<<<<< HEAD
layer at (0,0) size 800x59
RenderBlock {HTML} at (0,0) size 800x59
RenderBody {BODY} at (8,12) size 784x14
RenderText {#text} at (0,0) size 409x14
text run at (0,0) width 409: "Test passes if there is no white space between the blue box below and the orange lines."
RenderBlock (floating) {DIV} at (0,26) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
+=======
+layer at (0,0) size 800x72
+ RenderBlock {HTML} at (0,0) size 800x72
+ RenderBody {BODY} at (8,16) size 784x19
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 547x19
+ text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines."
+ RenderBlock (floating) {DIV} at (0,35) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
RenderImage {IMG} at (0,3) size 15x15