From ee70622264b85e0fb0ee82db76bff47c0e9fe0fd Mon Sep 17 00:00:00 2001
From: Gabor Javorszky <gabor@javorszky.co.uk>
Date: Sun, 29 Jun 2014 14:54:07 +0100
Subject: [PATCH] Bower's indentation is changed (grumble)

Closes #3130.

Because I flipped the table a TON of times that one file creating bloody merge conflicts ALL THE TIME. I have better use of my time than fixing indentation in merge conflict files. </rant>
---
 bower.json | 53 +++++++++++++++++++++++++----------------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/bower.json b/bower.json
index b5bd884e1d..0917ac9476 100644
--- a/bower.json
+++ b/bower.json
@@ -1,30 +1,27 @@
 {
-    "name": "ghost",
-    "dependencies": {
-        "backbone": "1.0.0",
-        "codemirror": "4.0.1",
-        "Countable": "2.0.2",
-        "ember": "1.5.0",
-        "ember-data": "~1.0.0-beta.8",
-        "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
-        "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e",
-        "fastclick": "1.0.0",
-        "ghost-ui": "0.8.1",
-        "handlebars": "1.3.0",
-        "ic-ajax": "1.0.1",
-        "jquery": "1.11.0",
-        "jquery-file-upload": "9.5.6",
-        "jquery-hammerjs": "1.0.1",
-        "jquery-ui": "1.10.4",
-        "keymaster": "madrobby/keymaster#0f09fc1b7e66c2b7e07afe89a419366dcf2d1cd8",
-        "lodash": "2.4.1",
-        "moment": "2.4.0",
-        "nprogress": "0.1.2",
-        "showdown": "https://github.com/ErisDS/showdown.git#v0.3.2-ghost",
-        "validator-js": "3.4.0",
-        "loader.js": "stefanpenner/loader.js#1.0.0"
-    },
-    "resolutions": {
-      "ember": "~1.4.0"
-    }
+  "name": "ghost",
+  "dependencies": {
+    "backbone": "1.0.0",
+    "codemirror": "4.0.1",
+    "Countable": "2.0.2",
+    "ember": "1.5.0",
+    "ember-data": "~1.0.0-beta.8",
+    "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
+    "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e",
+    "fastclick": "1.0.0",
+    "ghost-ui": "0.8.1",
+    "handlebars": "1.3.0",
+    "ic-ajax": "1.0.1",
+    "jquery": "1.11.0",
+    "jquery-file-upload": "9.5.6",
+    "jquery-hammerjs": "1.0.1",
+    "jquery-ui": "1.10.4",
+    "keymaster": "madrobby/keymaster#0f09fc1b7e66c2b7e07afe89a419366dcf2d1cd8",
+    "lodash": "2.4.1",
+    "moment": "2.4.0",
+    "nprogress": "0.1.2",
+    "showdown": "https://github.com/ErisDS/showdown.git#v0.3.2-ghost",
+    "validator-js": "3.4.0",
+    "loader.js": "stefanpenner/loader.js#1.0.0"
   }
+}