From 6c3af3d511ce2d528b128bdcf9e6b5481d4e93c6 Mon Sep 17 00:00:00 2001
From: the-cdnjs-curator <thomasalwyndavis+cdnjs@gmail.com>
Date: Mon, 6 Oct 2014 21:56:11 -0400
Subject: [PATCH] fixed another merge conflict

---
 ajax/libs/angular-route-segment/package.json | 28 --------------------
 1 file changed, 28 deletions(-)

diff --git a/ajax/libs/angular-route-segment/package.json b/ajax/libs/angular-route-segment/package.json
index c5a1d6984..dfef24150 100644
--- a/ajax/libs/angular-route-segment/package.json
+++ b/ajax/libs/angular-route-segment/package.json
@@ -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
 }