Permalink
Browse files

merged branch carlwitt/patch-1 (PR #1022)

This PR was merged into the master branch.

Commits
-------

59d0eed Update merge.rst

Discussion
----------

Update merge.rst

Typo in first line:
The merge filter merges an array with [removed: the] another array
  • Loading branch information...
2 parents 39d94fa + 59d0eed commit b6c2171579b4ab8c193322796ef757a185729cb8 @fabpot committed Mar 7, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 doc/filters/merge.rst
@@ -1,7 +1,7 @@
``merge``
=========
-The ``merge`` filter merges an array with the another array:
+The ``merge`` filter merges an array with another array:
.. code-block:: jinja

0 comments on commit b6c2171

Please sign in to comment.