diff options
Diffstat (limited to 'WebCore/dom/XMLDocumentParser.h')
| -rw-r--r-- | WebCore/dom/XMLDocumentParser.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/dom/XMLDocumentParser.h b/WebCore/dom/XMLDocumentParser.h index 9915409..7553cea 100644 --- a/WebCore/dom/XMLDocumentParser.h +++ b/WebCore/dom/XMLDocumentParser.h @@ -319,10 +319,6 @@ bool parseXMLDocumentFragment(const String&, DocumentFragment*, Element* parent } // namespace WebCore -<<<<<<< HEAD #endif // USE(EXPAT) -#endif // XMLTokenizer_h -======= #endif // XMLDocumentParser_h ->>>>>>> webkit.org at r61871 |