# HG changeset patch
# User Bob Mourlam <bob.mourlam@gmail.com>
# Date 1320111523 18000
# Node ID abe08d74dab3d7b0f0558da6b699e5868bc295de
# Parent  5348d2235497f70e23c9d8f5316b4571f23285f0# Parent  71f2beb037899cb21d0f8aa5bace7cefcb678ec2
I merged Chris' Reviews branch with mine.

diff -r 71f2beb03789 -r abe08d74dab3 bns_website/bands/admin.py
--- a/bns_website/bands/admin.py	Sun Oct 30 23:07:05 2011 -0500
+++ b/bns_website/bands/admin.py	Mon Oct 31 20:38:43 2011 -0500
@@ -4,7 +4,6 @@
 """
 from django.contrib import admin
 from bands.models import Band
-from news.models import News
 
 
 class BandAdmin(admin.ModelAdmin):
@@ -12,4 +11,3 @@
     list_editable = ['order']
 
 admin.site.register(Band, BandAdmin)
-admin.site.register(News)
diff -r 71f2beb03789 -r abe08d74dab3 bns_website/news/admin.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bns_website/news/admin.py	Mon Oct 31 20:38:43 2011 -0500
@@ -0,0 +1,8 @@
+"""
+Automatic admin definitions for the models in the bands application.
+
+"""
+from django.contrib import admin
+from news.models import News
+
+admin.site.register(News)