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
a8a879eebc805f27de9eb27fa05bce291ee931ff
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflicts
components
parallel_conflict_lines.js.es6
Find file
Blame
History
Permalink
Fix Merge Conflicts app to make it work with Vue 2
· 6dbca364
Alfredo Sumaran
authored
Nov 09, 2016
6dbca364
parallel_conflict_lines.js.es6
1.12 KB
Edit
Web IDE
Replace parallel_conflict_lines.js.es6
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace parallel_conflict_lines.js.es6
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
