diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-16 10:56:04 -0500 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-23 15:41:54 -0500 |
| commit | 17b3f5316d19d1f81088570136116e1102fc1d3e (patch) | |
| tree | 3ed942cb1cbd9249de17f13c644ed30e375249b4 | |
| parent | 57a7a89820217c1d9a99b1387f655c0ed996a345 (diff) | |
| download | gitlab-ce-17b3f5316d19d1f81088570136116e1102fc1d3e.tar.gz | |
Fix conflicts
| -rw-r--r-- | config/webpack.config.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 0e96a2f6941..1cdd1d83baf 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -66,7 +66,6 @@ var config = { notebook_viewer: './blob/notebook_viewer.js', pdf_viewer: './blob/pdf_viewer.js', pipelines: './pipelines/pipelines_bundle.js', - pipelines_details: './pipelines/pipeline_details_bundle.js', profile: './profile/profile_bundle.js', project_import_gl: './projects/project_import_gitlab_project.js', protected_branches: './protected_branches', |