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
Léo-Paul Géneau
gitlab-ce
Repository
You need to sign in or sign up before continuing.
4e6af0c3fa335d138343dce3e0216303a9b1cd79
Switch branch/tag
gitlab-ce
app
views
projects
merge_requests
conflicts.html.haml
Find file
Blame
History
Permalink
Improve components for PhantomJs compatibility
· c4142cf9
Alfredo Sumaran
authored
Oct 05, 2016
c4142cf9
conflicts.html.haml
2.23 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.