Merge branch 'master' into julian

[philo.git] / models / fields / __init__.py

diff --git a/models/fields/__init__.py b/models/fields/__init__.py
index a22e161..d8ed839 100644 (file)
--- a/models/fields/__init__.py
+++ b/models/fields/__init__.py
@@ -3,7 +3,7 @@ from django.db import models
 from django.utils import simplejson as json
 from philo.forms.fields import JSONFormField
 from philo.validators import TemplateValidator, json_validator
-from philo.models.fields.attributes import *
+#from philo.models.fields.entities import *
 
 
 class TemplateField(models.TextField):