Fix bad resolved conflict

630a76b4 · Filipa Lacerda · 5acbd499 · 630a76b4
Commit 630a76b4 authored Mar 06, 2017 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/javascripts/environments/components/deploy_board_component.js ...scripts/environments/components/deploy_board_component.js +1 -1

No files found.
--- a/app/assets/javascripts/environments/components/deploy_board_component.js
+++ b/app/assets/javascripts/environments/components/deploy_board_component.js
@@ -20,7 +20,7 @@
 */
 import statusCodes from '~/lib/utils/http_status';
 import '~/flash';
-import '~/lib/utils/common_utils.js.es6';
+import '~/lib/utils/common_utils';
 import deployBoardSvg from 'empty_states/icons/_deploy_board.svg';
 import instanceComponent from './deploy_board_instance_component';