git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'julian' of git://github.com/lapilofu/philo
[philo.git]
/
models
/
__init__.py
diff --git
a/models/__init__.py
b/models/__init__.py
index
76d7812
..
523f789
100644
(file)
--- a/
models/__init__.py
+++ b/
models/__init__.py
@@
-2,7
+2,6
@@
from philo.models.base import *
from philo.models.collections import *
from philo.models.nodes import *
from philo.models.pages import *
from philo.models.collections import *
from philo.models.nodes import *
from philo.models.pages import *
-from philo.models.fields import *
from django.contrib.auth.models import User, Group
from django.contrib.sites.models import Site
from django.contrib.auth.models import User, Group
from django.contrib.sites.models import Site