Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed a merge error I missed
  • Loading branch information
kkress committed Sep 9, 2012
1 parent baddb7d commit c881c9f
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions r2/r2/controllers/__init__.py
Expand Up @@ -70,6 +70,18 @@ def load_controllers():
from r2.controllers.front import FrontController
from r2.controllers.health import HealthController
from r2.controllers.buttons import ButtonsController
from r2.controllers.captcha import CaptchaController
from r2.controllers.embed import EmbedController
from r2.controllers.error import ErrorController
from r2.controllers.post import PostController
from r2.controllers.toolbar import ToolbarController
from r2.controllers.awards import AwardsController
from r2.controllers.ads import AdsController
from r2.controllers.usage import UsageController
from r2.controllers.errorlog import ErrorlogController
from r2.controllers.promotecontroller import PromoteController
from r2.controllers.mediaembed import MediaembedController
from r2.controllers.mediaembed import AdController

from r2.controllers.wiki import WikiController
from r2.controllers.wiki import WikiApiController
Expand Down

0 comments on commit c881c9f

Please sign in to comment.