From b0802bc3b27d0faf8628e0829332b5509351ae62 Mon Sep 17 00:00:00 2001
From: Aditi <aditi.iitr@gmail.com>
Date: Thu, 29 Aug 2013 10:34:47 +0530
Subject: [PATCH] Resolve merge conflict.

---
 mediagoblin/routing.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index daf8a45d..327ed8cc 100644
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -36,10 +36,8 @@ def get_url_map():
     import mediagoblin.webfinger.routing
     import mediagoblin.listings.routing
     import mediagoblin.notifications.routing
-<<<<<<< HEAD
-=======
     import mediagoblin.oauth.routing
->>>>>>> e7b8059f17c98ee88d933af52b0c4d858e882e8e
+
     
     for route in PluginManager().get_routes():
         add_route(*route)