Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
GitLab.org
GitLab
Repository
gitlab
app
assets
javascripts
merge_conflicts
merge_conflict_resolver_app.vue
Find file
Blame
History
Permalink
Fix failing specs
· bc96aa22
Lukas 'ai-pi' Eipert
authored
Apr 14, 2021
bc96aa22