diff options
Diffstat (limited to 'WebCore/GNUmakefile.am')
| -rw-r--r-- | WebCore/GNUmakefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am index 10edb0f..7afe8d8 100644 --- a/WebCore/GNUmakefile.am +++ b/WebCore/GNUmakefile.am @@ -15,10 +15,7 @@ webcore_cppflags += \ -I$(srcdir)/WebCore/bridge \ -I$(srcdir)/WebCore/bridge/c \ -I$(srcdir)/WebCore/bridge/jni/jsc \ -<<<<<<< HEAD -======= -I$(srcdir)/WebCore/bridge/jsc \ ->>>>>>> webkit.org at r54127 -I$(srcdir)/WebCore/css \ -I$(srcdir)/WebCore/dom \ -I$(srcdir)/WebCore/dom/default \ |