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
You need to sign in or sign up before continuing.
636b7cab70d6c5e915e14068015771aad1186d03
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflicts
mixins
line_conflict_utils.js
Find file
Blame
History
Permalink
Removes merge conflicts vue code from globalnamespace
· 75f69274
Filipa Lacerda
authored
Jun 13, 2018
75f69274
line_conflict_utils.js
256 Bytes
Edit
Web IDE
Replace line_conflict_utils.js
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace line_conflict_utils.js
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
