From 0797a89088830dbddd2a12328b9eda541899c877 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 17 Sep 2013 15:04:46 -0700
Subject: [PATCH] Add bootstrap to package.json

Removes the need to have it as a submodule by just using it directly
from the package.json using a Git URL bound to v3.0.0
---
 .gitmodules      | 3 ---
 Gruntfile.coffee | 2 +-
 package.json     | 1 +
 vendor/bootstrap | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 160000 vendor/bootstrap

diff --git a/.gitmodules b/.gitmodules
index acbd92934..e4335ef79 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "vendor/bootstrap"]
-	path = vendor/bootstrap
-	url = https://github.com/twbs/bootstrap
 [submodule "vendor/apm"]
 	path = vendor/apm
 	url = https://github.com/atom/apm.git
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index f4df4bb1b..ede7470c1 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -44,7 +44,7 @@ module.exports = (grunt) ->
   prebuildLessConfig =
     src: [
       'static/**/*.less'
-      'vendor/bootstrap/less/bootstrap.less'
+      'node_modules/bootstrap/less/bootstrap.less'
     ]
 
   csonConfig =
diff --git a/package.json b/package.json
index ad262bb45..e3ed6e8f9 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "atomShellVersion": "0.4.7",
   "dependencies": {
     "async": "0.2.6",
+    "bootstrap": "git://github.com/twbs/bootstrap.git#v3.0.0",
     "coffee-script": "1.6.2",
     "coffeestack": "0.4.0",
     "first-mate": "0.1.0",
diff --git a/vendor/bootstrap b/vendor/bootstrap
deleted file mode 160000
index e8a1df5f0..000000000
--- a/vendor/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e8a1df5f060bf7e6631554648e0abde150aedbe4