Skip to content

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

Resolve conflict in app/assets/javascripts/pipelines/components/pipelines.vue 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent bab361d8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/pipelines/components/pipelines.vue
View file @ 9ba243a5
...@@ -171,10 +171,7 @@ ...@@ -171,10 +171,7 @@
*/ */
updateContent(parameters) { updateContent(parameters) {
this.updateInternalState(parameters); this.updateInternalState(parameters);
<<<<<<< HEAD
=======
>>>>>>> origin/master
// fetch new data // fetch new data
return this.service.getPipelines(this.requestData) return this.service.getPipelines(this.requestData)
.then((response) => { .then((response) => {
......
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