Resolve merge conflict.

2013-08-29 10:34:47 +05:30 · 2013-08-29 10:34:47 +05:30 · b0802bc3b2
commit b0802bc3b2
parent 0b2ea4bb4f
1 changed files with 1 additions and 3 deletions
--- 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)