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
nexedi
gitlab-ce
Repository
cc06bb2c6ec1facf2b1eb50803dbedc076abe017
Switch branch/tag
gitlab-ce
app
views
projects
merge_requests
conflicts.html.haml
Find file
Blame
History
Permalink
remove merge_conflicts bundle in favor of pages directory entry point
· 94d5dd3b
Mike Greiling
authored
Feb 27, 2018
94d5dd3b
conflicts.html.haml
1.94 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.
