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
You need to sign in or sign up before continuing.
10321bf862135b946d50918e89bc4667e8d9071d
Switch branch/tag
gitlab-ce
app
assets
stylesheets
pages
merge_conflicts.scss
Find file
Blame
History
Permalink
Fixes for merge conflicts UI.
· 10321bf8
Fatih Acet
authored
Jul 29, 2016
10321bf8
merge_conflicts.scss
1.79 KB
Edit
Web IDE
Replace merge_conflicts.scss
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace merge_conflicts.scss
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.