BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Repository
6dbca36490bff0f2c1af4a323f0e76b8d971a4ab
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflicts
components
History
Find file
Select Archive Format
Source code
Download zip
Download tar.gz
Download tar.bz2
Download tar
Fix Merge Conflicts app to make it work with Vue 2
· 6dbca364
Alfredo Sumaran
authored
Nov 09, 2016
6dbca364
Name
Last commit
Last update
..
diff_file_editor.js.es6
Loading commit data...
inline_conflict_lines.js.es6
Loading commit data...
parallel_conflict_lines.js.es6
Loading commit data...
