Skip to content

G
gitlab-ce
Commit 9008c015 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in app/assets/javascripts/environments/folder/environments_folder_bundle.js 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent cfa58afc
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 13 deletions
app/assets/javascripts/environments/folder/environments_folder_bundle.js
View file @ 9008c015
...@@ -5,18 +5,6 @@ import Translate from '../../vue_shared/translate'; ...@@ -5,18 +5,6 @@ import Translate from '../../vue_shared/translate';
Vue.use(Translate); Vue.use(Translate);
<<<<<<< HEAD
document.addEventListener('DOMContentLoaded', () => {
// eslint-disable-next-line no-new
new Vue({
el: '#environments-folder-list-view',
components: {
'environments-folder-app': EnvironmentsFolderComponent,
},
render: createElement => createElement('environments-folder-app'),
});
});
=======
document.addEventListener('DOMContentLoaded', () => new Vue({ document.addEventListener('DOMContentLoaded', () => new Vue({
el: '#environments-folder-list-view', el: '#environments-folder-list-view',
components: { components: {
...@@ -45,4 +33,3 @@ document.addEventListener('DOMContentLoaded', () => new Vue({ ...@@ -45,4 +33,3 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
}); });
}, },
})); }));
>>>>>>> ce/master
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7