From 599fc78a946df0c7c9901fa56332eb015574167f Mon Sep 17 00:00:00 2001
From: connors <connor.sears@github.com>
Date: Thu, 12 Sep 2013 21:27:55 -0700
Subject: [PATCH] huge derpin here

---
 package.json | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/package.json b/package.json
index 704a43b..59f4079 100644
--- a/package.json
+++ b/package.json
@@ -1,31 +1,4 @@
 {
-<<<<<<< HEAD
-    "name": "ratchet"
-  , "version": "2.0.0"
-  , "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-jshint": "~0.6.3",
-    "grunt-contrib-nodeunit": "~0.2.0",
-    "grunt-contrib-uglify": "~0.2.2"
-  }
-  , "keywords": ["ratchet", "css", "ios", "prototype"]
-  , "homepage": "http://twbs.github.com/bootstrap/"
-  , "author": "Connor Sears, Dave Gamache, and Jacob Thornton"
-  , "repository": {
-      "type": "git"
-    , "url": "https://github.com/maker/ratchet.git"
-  }
-  , "bugs": {
-      "url": "https://github.com/maker/ratchet/issues"
-  }
-  , "licenses": [
-    {
-        "type": "MIT"
-      , "url": "http://www.opensource.org/licenses/MIT"
-    }
-   ]
-}
-=======
   "name": "ratchet",
   "version": "2.0.0",
   "dependencies": {},
@@ -60,4 +33,3 @@
     }
   ]
 }
->>>>>>> derp