Permalink
Browse files

fix conflic

  • Loading branch information...
2 parents 90e1cf0 + d4026f4 commit bc86cd57a372c28a3b0582e91b5f2f0c6eb9dbab lepture committed Sep 1, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 june/topic/views.py
View
@@ -7,6 +7,7 @@
from june.node.models import Node
from .models import Topic
+
app = Blueprint('topic', __name__, template_folder='templates')

0 comments on commit bc86cd5

Please sign in to comment.