diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-08-29 10:34:47 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-08-29 10:34:47 +0530 |
| commit | b0802bc3b27d0faf8628e0829332b5509351ae62 (patch) | |
| tree | 1434e91990a16d31116b638cec0135e4e512c4b9 /mediagoblin/routing.py | |
| parent | 0b2ea4bb4f96885c445e69a67785ea25587a3962 (diff) | |
| download | mediagoblin-b0802bc3b27d0faf8628e0829332b5509351ae62.tar.lz mediagoblin-b0802bc3b27d0faf8628e0829332b5509351ae62.tar.xz mediagoblin-b0802bc3b27d0faf8628e0829332b5509351ae62.zip | |
Resolve merge conflict.
Diffstat (limited to 'mediagoblin/routing.py')
| -rw-r--r-- | mediagoblin/routing.py | 4 |
1 files changed, 1 insertions, 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) |