Resolve merge conflict.

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index daf8a45d216dfbd488ed52a4712b124ee6e93c9a..327ed8ccaa36106a9692b357b444ff23f952d8e4 100644 (file)
--- 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)