hgbook
diff web/texpand.py @ 969:108c5ecc8232
fix merge with Bryan on this particular file
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Sun Aug 16 18:08:05 2009 +0200 (2009-08-16) |
parents | ad304b606163 |
children |
line diff
1.1 --- a/web/texpand.py Tue Mar 10 21:42:19 2009 -0700 1.2 +++ b/web/texpand.py Sun Aug 16 18:08:05 2009 +0200 1.3 @@ -7,7 +7,7 @@ 1.4 from django.template import Context, TemplateDoesNotExist 1.5 from django.template.loader import get_template, get_template_from_string 1.6 from django.core.management import setup_environ 1.7 -import rwh.settings as settings 1.8 +import hgbook.settings as settings 1.9 import sys 1.10 1.11 setup_environ(settings)