Skip to content

G
gitlab-ce
Commit ca43749a authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Fix conflict for app/assets/javascripts/boards/components/board_card.vue

parent 9389482d
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/boards/components/board_card.vue
View file @ ca43749a
...@@ -35,12 +35,9 @@ export default { ...@@ -35,12 +35,9 @@ export default {
type: String, type: String,
default: '', default: '',
}, },
<<<<<<< HEAD
groupId: { groupId: {
type: Number, type: Number,
}, },
=======
>>>>>>> upstream/master
}, },
data() { data() {
return { return {
......
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