Resolve conflict in webpack.config.js

f8451e64 · Rémy Coutable · 6f9fb5b8 · f8451e64
Commit f8451e64 authored Feb 20, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

config/webpack.config.js config/webpack.config.js +0 -3

No files found.
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -66,10 +66,7 @@ var config = {
    epic_show:            'ee/epics/epic_show/epic_show_bundle.js',
    new_epic:             'ee/epics/new_epic/new_epic_bundle.js',
    filtered_search:      './filtered_search/filtered_search_bundle.js',
-<<<<<<< HEAD
    geo_nodes:            'ee/geo_nodes',
-=======
->>>>>>> upstream/master
    help:                 './help/help.js',
    issuable:             './issuable/issuable_bundle.js',
    issues:               './issues/issues_bundle.js',