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.
5acbd4998bee35aff554a527679628ef2a324d0c
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflicts
mixins
line_conflict_utils.js
Find file
Blame
History
Permalink
Remove .es6 from file extensions (!1344)
· e296e2a2
winniehell
authored
Mar 05, 2017
e296e2a2
line_conflict_utils.js
477 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.
