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
9d70a4ba769d7d0c652e37dc0341f5230b125fc8
Switch branch/tag
gitlab-ce
app
assets
stylesheets
pages
merge_conflicts.scss
Find file
Blame
History
Permalink
Added new UI components for Merge Conflicts UI.
· 9d70a4ba
Fatih Acet
authored
Jul 12, 2016
9d70a4ba
merge_conflicts.scss
1.08 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.
