diff options
| author | Armin Ronacher <armin.ronacher@active-4.com> | 2013-05-18 12:11:05 +0100 |
|---|---|---|
| committer | Armin Ronacher <armin.ronacher@active-4.com> | 2013-05-18 12:11:05 +0100 |
| commit | 4cd6e9a8099e3587c736186ba1cb1d33c6101243 (patch) | |
| tree | 2588c0e644aa00c694e869ba4169b7ddfe28cbad /ext/django2jinja/django2jinja.py | |
| parent | e2fc8749bcb4f9fdc8e26a00bc91ab801166d2af (diff) | |
| parent | b9c76fb845ba3bb5ec0a1bd462097ceb626e7138 (diff) | |
| download | jinja2-4cd6e9a8099e3587c736186ba1cb1d33c6101243.tar.gz | |
Merge branch 'master' into sprint-branch
Diffstat (limited to 'ext/django2jinja/django2jinja.py')
| -rw-r--r-- | ext/django2jinja/django2jinja.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/django2jinja/django2jinja.py b/ext/django2jinja/django2jinja.py index 6d9e76c..ad9627f 100644 --- a/ext/django2jinja/django2jinja.py +++ b/ext/django2jinja/django2jinja.py @@ -609,7 +609,7 @@ def width_ratio(writer, node): @node(core_tags.WithNode) def with_block(writer, node): writer.warn('with block expanded into set statement. This could cause ' - 'variables following that block to be overriden.', node) + 'variables following that block to be overridden.', node) writer.start_block() writer.write('set %s = ' % node.name) writer.node(node.var) |