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
a8b33d7b5db99f47000316a8dc167106214ca4f8
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflicts
merge_conflict_store.js
Find file
Blame
History
Permalink
fix conflict pluralized
· a8b33d7b
Emilien Mottet
authored
Jul 24, 2017
a8b33d7b
merge_conflict_store.js
12.1 KB
Edit
Web IDE
Replace merge_conflict_store.js
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace merge_conflict_store.js
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.