Skip to content

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

Fix conflict for app/assets/javascripts/cycle_analytics/components/stage_component.vue

parent 90417f68
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 12 deletions
app/assets/javascripts/cycle_analytics/components/stage_component.vue
View file @ 38213c2e
...@@ -47,26 +47,14 @@ ...@@ -47,26 +47,14 @@
<a <a
:href="issue.url" :href="issue.url"
class="issue-link" class="issue-link"
<<<<<<< HEAD
>
#{{ issue.iid }}
</a>
=======
>#{{ issue.iid }}</a> >#{{ issue.iid }}</a>
>>>>>>> upstream/master
&middot; &middot;
<span> <span>
{{ s__('OpenedNDaysAgo|Opened') }} {{ s__('OpenedNDaysAgo|Opened') }}
<a <a
:href="issue.url" :href="issue.url"
class="issue-date" class="issue-date"
<<<<<<< HEAD
>
{{ issue.createdAt }}
</a>
=======
>{{ issue.createdAt }}</a> >{{ issue.createdAt }}</a>
>>>>>>> upstream/master
</span> </span>
<span> <span>
{{ s__('ByAuthor|by') }} {{ s__('ByAuthor|by') }}
......
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