From: melinath Date: Fri, 18 Jun 2010 14:43:39 +0000 (-0400) Subject: Merge branch 'master' of http://git.ithinksw.org/philo X-Git-Tag: philo-0.9~76^2~1^2~4 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/da63b5b1fdcd03f375ff6b40a1d022d4e8778801?hp=118eb9b3276b91fe7f54f904abad893ed2f0c496 Merge branch 'master' of git.ithinksw.org/philo --- diff --git a/models.py b/models.py index 4df28d3..6be9951 100644 --- a/models.py +++ b/models.py @@ -298,9 +298,6 @@ class File(Node): response = HttpResponse(wrapper, content_type=self.mimetype) response['Content-Length'] = self.file.size return response - - def __unicode__(self): - return self.file class Template(TreeModel):