Skip to content

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

Resolve conflict in app/assets/javascripts/sidebar/components/assignees/assignees.vue 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 60c6c55e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/assets/javascripts/sidebar/components/assignees/assignees.vue
View file @ 31e842d2
...@@ -194,10 +194,7 @@ export default { ...@@ -194,10 +194,7 @@ export default {
> >
<a <a
class="user-link has-tooltip" class="user-link has-tooltip"
<<<<<<< HEAD
data-container="body" data-container="body"
=======
>>>>>>> upstream/master
data-placement="bottom" data-placement="bottom"
:href="assigneeUrl(user)" :href="assigneeUrl(user)"
:data-title="user.name" :data-title="user.name"
...@@ -232,4 +229,3 @@ export default { ...@@ -232,4 +229,3 @@ export default {
</div> </div>
</div> </div>
</template> </template>
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