home/cdnjs
2
0
Fork 0
mirror of https://github.com/wahyd4/cdnjs.git synced 2026-08-27 21:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

fixed another merge conflict

Browse Source
This commit is contained in:
the-cdnjs-curator
2014-10-06 21:56:11 -04:00
parent a75ad9ccf2
commit 6c3af3d511
1 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ajax/libs/angular-route-segment/package.json
-28
View File
@@ -1,31 +1,4 @@
{
<<<<<<< HEAD
"name": "angular-route-segment",
"filename": "angular-route-segment.min.js",
"version": "1.3.3",
"description": "A lightweight extension for AngularJS $route service which supports tree-like nested views and routes hierarchy, and advanced loading flow handling.",
"homepage": "http://angular-route-segment.com/",
"keywords": [
"angular",
"angularjs",
"routing",
"routes",
"route"
],
"author": [
{
"name": "Artem Chivchalov",
"url": "https://github.com/artch",
"email": "chivchalov@gmail.com"
}
],
"repositories": [
{
"type": "git",
"url": "https://github.com/artch/angular-route-segment.git"
}
]
=======
"name": "angular-route-segment",
"filename": "angular-route-segment.min.js",
"version": "1.3.3",
@@ -59,5 +32,4 @@
"*"
]
}
>>>>>>> d7c3c1ef817c6942570109fcebc7f6ed6ce95bbf
}