Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Repository
3e99123095b26988de67a94b0e7a5207c1ef5ae2
Switch branch/tag
gitlab-ce
app
views
projects
diffs
_parallel_view.html.haml
Find file
Blame
History
Permalink
Fix merge conflicts - squashed commit
· 3e991230
James Lopez
authored
Jun 03, 2016
# Conflicts: # app/models/project.rb
3e991230
_parallel_view.html.haml
2.35 KB
Edit
Web IDE
Replace _parallel_view.html.haml
×
Attach a file by drag & drop or
click to upload
Commit message
Replace _parallel_view.html.haml
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
