Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
dde9b669
Commit
dde9b669
authored
May 04, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix webpack config conflict
parent
b0a9a7cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
5 deletions
+0
-5
config/webpack.config.js
config/webpack.config.js
+0
-5
No files found.
config/webpack.config.js
View file @
dde9b669
...
...
@@ -33,11 +33,6 @@ var config = {
graphs
:
'
./graphs/graphs_bundle.js
'
,
group
:
'
./group.js
'
,
groups_list
:
'
./groups_list.js
'
,
<<<<<<<
HEAD
issuable
:
'
./issuable/issuable_bundle.js
'
,
=======
issues
:
'
./issues/issues_bundle.js
'
,
>>>>>>>
b0a2435
...
Merge
branch
'
multiple_assignees_review_upstream
'
into
ee_master
issue_show
:
'
./issue_show/index.js
'
,
main
:
'
./main.js
'
,
merge_conflicts
:
'
./merge_conflicts/merge_conflicts_bundle.js
'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment