1 files changed, 0 insertions, 5 deletions
diff --git a/Source/WebCore/dom/StyleElement.cpp b/Source/WebCore/dom/StyleElement.cpp
index e9d035d..9892ed7 100644
--- a/Source/WebCore/dom/StyleElement.cpp
+++ b/Source/WebCore/dom/StyleElement.cpp
@@ -103,15 +103,10 @@ void StyleElement::process(Element* e)
     for (Node* c = e->firstChild(); c; c = c->nextSibling()) {
         if (isValidStyleChild(c)) {
             unsigned length = c->nodeValue().length();
-<<<<<<< HEAD
-            if (length > std::numeric_limits<unsigned>::max() - resultLength)
-                CRASH();
-=======
             if (length > std::numeric_limits<unsigned>::max() - resultLength) {
                 createSheet(e, m_startLineNumber, "");
                 return;
             }
->>>>>>> webkit.org at r82507
             resultLength += length;
         }
     }