Merge branch 'develop' of git://github.com/melinath/philo into develop

[philo.git] / philo / admin / base.py

diff --git a/philo/admin/base.py b/philo/admin/base.py
index 3a9458e..81916ab 100644 (file)
--- a/philo/admin/base.py
+++ b/philo/admin/base.py
@@ -136,11 +136,7 @@ class EntityAdmin(admin.ModelAdmin):
                return db_field.formfield(**kwargs)
 
 
-class TreeAdmin(MPTTModelAdmin):
-       pass
-
-
-class TreeEntityAdmin(EntityAdmin, TreeAdmin):
+class TreeEntityAdmin(EntityAdmin, MPTTModelAdmin):
        pass