From: melinath <stephen.r.burrows@gmail.com>
Date: Mon, 14 Jun 2010 19:42:28 +0000 (-0400)
Subject: Rebased to origin; removed treechanges.
X-Git-Tag: philo-0.9~78^2~2^2~6
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/e1a2167421a6b3538a405ec037c72777163fb949

Rebased to origin; removed treechanges.
---

e1a2167421a6b3538a405ec037c72777163fb949
diff --cc admin.py
index 506267d,1ed5586..0744e0b
--- a/admin.py
+++ b/admin.py
@@@ -7,9 -7,7 +7,9 @@@ from django.utils.translation import ug
  from django.utils.safestring import mark_safe
  from django.utils.html import escape
  from django.utils.text import truncate_words
- from models import *
+ from philo.models import *
 +from django.core.exceptions import ValidationError, ObjectDoesNotExist
 +from validators import TreeParentValidator, TreePositionValidator
  
  
  class AttributeInline(generic.GenericTabularInline):