Skip to content

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

Resolve conflict in app/assets/javascripts/ide/components/ide_context_bar.vue 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 1ed7baba
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/assets/javascripts/ide/components/ide_context_bar.vue
View file @ f5d890bd
<script> <script>
<<<<<<< HEAD
import { mapState, mapActions } from 'vuex'; import { mapState, mapActions } from 'vuex';
=======
import { mapGetters, mapState, mapActions } from 'vuex';
>>>>>>> upstream/master
import icon from '~/vue_shared/components/icon.vue'; import icon from '~/vue_shared/components/icon.vue';
import panelResizer from '~/vue_shared/components/panel_resizer.vue'; import panelResizer from '~/vue_shared/components/panel_resizer.vue';
import repoCommitSection from './repo_commit_section.vue'; import repoCommitSection from './repo_commit_section.vue';
......
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