From 96f7db3d8ab53ce801f6eff278899b021b790638 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 29 Oct 2013 23:12:38 -0700
Subject: [PATCH] switching habitrpg-shared over from #rewrite to #master, will
 remove rewrite branch soon after we're launched with challenges @shaners
 @paglias

---
 bower.json   | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 5150bf06b2..dae72c3dc1 100644
--- a/bower.json
+++ b/bower.json
@@ -19,7 +19,7 @@
     "angular-resource": "1.2.0-rc.2",
     "angular-ui": "~0.4.0",
     "angular-bootstrap": "~0.5.0",
-    "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#challenges",
+    "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#master",
     "bootstrap-tour": "0.5.0",
     "BrowserQuest": "https://github.com/mozilla/BrowserQuest.git",
     "github-buttons": "git://github.com/mdo/github-buttons.git",
diff --git a/package.json b/package.json
index 56ecf29414..5335c82458 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.0-152",
   "main": "./src/server.js",
   "dependencies": {
-    "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared#challenges",
+    "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared#master",
     "derby-auth": "git://github.com/lefnire/derby-auth#master",
     "connect-mongo": "*",
     "passport-facebook": "~1.0.0",