From 07b2e7e2271bb4d85088f4d6fcf19e94802bc731 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Wed, 27 Oct 2010 18:11:09 -0700
Subject: [PATCH] omg i was deploying the wrong branch for the past two hours

---
 config/deploy_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index 46e28222b..dcb0ced04 100644
--- a/config/deploy_config.yml
+++ b/config/deploy_config.yml
@@ -6,7 +6,7 @@ cross_server:
   deploy_to: '/usr/local/app/diaspora'
   user: 'root'
   repo: 'git://github.com/diaspora/diaspora.git'
-  branch: 'em-webfinger'
+  branch: 'emw-merge'
   default_env: 'development'
 servers:
   tom: