Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Jérome Perrin
gitlab-ce
Repository
c439be58ff389053c892f2a74a72abaaea831a1f
Switch branch/tag
gitlab-ce
app
views
projects
merge_requests
show
_conflicts.html.haml
Find file
Blame
History
Permalink
Some minor change on conflicts template.
· c439be58
Fatih Acet
authored
Jul 31, 2016
c439be58
_conflicts.html.haml
3.72 KB
Edit
Web IDE
Replace _conflicts.html.haml
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace _conflicts.html.haml
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
