resolve conflict

pull/1/head
eshellman 2011-12-02 19:42:15 -05:00
parent a809ac7aaa
commit 33be981cd8
1 changed files with 1 additions and 1 deletions

View File

@ -6,7 +6,7 @@ from django.contrib.auth.decorators import login_required
from regluit.core.models import Campaign
from regluit.frontend.views import CampaignFormView, GoodreadsDisplayView, LibraryThingView, PledgeView
from regluit.frontend.views import CampaignListView, DonateView
from regluit.frontend.views import CampaignListView, DonateView, WorkListView
urlpatterns = patterns(
"regluit.frontend.views",