From 17b3f5316d19d1f81088570136116e1102fc1d3e Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Fri, 16 Feb 2018 10:56:04 -0500 Subject: Fix conflicts --- config/webpack.config.js | 1 - 1 file changed, 1 deletion(-) (limited to 'config/webpack.config.js') 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', -- cgit v1.2.1