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
3b84cfdc74e27c5f0b94187f5a15c95e3f292554
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflict_data_provider.js.es6
Find file
Blame
History
Permalink
Use same resolution format on FE and BE
· 3b84cfdc
Sean McGivern
authored
Aug 02, 2016
3b84cfdc
merge_conflict_data_provider.js.es6
7.18 KB
Edit
Web IDE
Replace merge_conflict_data_provider.js.es6
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace merge_conflict_data_provider.js.es6
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
