Skip to content
GitLab
Explore
Sign in
Register
heptapod
heptapod
Repository
heptapod
app
views
projects
merge_requests
conflicts.html.haml
Find file
Blame
History
Permalink
Show appropriate message when conflicts have already been resolved
· 3ab63b2c595b
Douwe Maan
authored
Aug 10, 2016
3ab63b2c595b