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
Tatuya Kamada
gitlab-ce
Repository
3e99123095b26988de67a94b0e7a5207c1ef5ae2
Switch branch/tag
gitlab-ce
VERSION
Find file
Blame
History
Permalink
Fix merge conflicts - squashed commit
· 3e991230
James Lopez
authored
Jun 03, 2016
# Conflicts: # app/models/project.rb
3e991230
VERSION
10 Bytes
Edit
Web IDE
Replace VERSION
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace VERSION
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
