summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-01-13 11:27:19 -0500
committerMike Greiling <mike@pixelcog.com>2017-01-13 13:03:10 -0500
commit2ee2daa4b91f255218d6f68befa8395d2c62bb3a (patch)
tree9cbfdd1d73a7ede84b42697f4e22881402865ce9 /config
parentfc4fcf33bfa3279bb0a81aac8498ada67b5e309b (diff)
downloadgitlab-ce-2ee2daa4b91f255218d6f68befa8395d2c62bb3a.tar.gz
more post-merge fixes
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index e9b63eb3bca..0b40e2c6190 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -35,7 +35,7 @@ var config = {
lib_chart: './lib/chart.js',
lib_d3: './lib/d3.js',
vue_pagination: './vue_pagination/index.js',
- vue_pipelines: './vue_pipelines_index/index.js',
+ vue_pipelines: './vue_pipelines_index/index.js',
},
output: {