diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderBlockLineLayout.cpp')
-rw-r--r-- | Source/WebCore/rendering/RenderBlockLineLayout.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp index 00c2d86..5e2b52d 100644 --- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp @@ -42,7 +42,13 @@ #include <wtf/RefCountedLeakCounter.h> #include <wtf/StdLibExtras.h> #include <wtf/Vector.h> -<<<<<<< HEAD +#include <wtf/unicode/CharacterNames.h> + +#if ENABLE(SVG) +#include "RenderSVGInlineText.h" +#include "SVGRootInlineBox.h" +#endif + #ifdef ANDROID_LAYOUT #include "Frame.h" #include "FrameTree.h" @@ -50,14 +56,6 @@ #include "Text.h" #include "HTMLNames.h" #endif // ANDROID_LAYOUT -======= -#include <wtf/unicode/CharacterNames.h> ->>>>>>> webkit.org at r78450 - -#if ENABLE(SVG) -#include "RenderSVGInlineText.h" -#include "SVGRootInlineBox.h" -#endif using namespace std; using namespace WTF; |