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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b37c7a3a
Commit
b37c7a3a
authored
Aug 17, 2016
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use bundled Vue lib
parent
e6f3461c
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
10074 deletions
+1
-10074
app/assets/javascripts/lib/vue.js
app/assets/javascripts/lib/vue.js
+0
-10073
app/assets/javascripts/merge_conflict_resolver.js.es6
app/assets/javascripts/merge_conflict_resolver.js.es6
+1
-1
No files found.
app/assets/javascripts/lib/vue.js
deleted
100644 → 0
View file @
e6f3461c
This diff is collapsed.
Click to expand it.
app/assets/javascripts/merge_conflict_resolver.js.es6
View file @
b37c7a3a
//= require
lib/
vue
//= require vue
class MergeConflictResolver {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment