projects
/
web/konrad/twig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
39d94fa
)
Update merge.rst
author
carlwitt
<carl.witt@fu-berlin.de>
Mon, 4 Mar 2013 09:54:34 +0000 (10:54 +0100)
committer
carlwitt
<carl.witt@fu-berlin.de>
Mon, 4 Mar 2013 09:54:34 +0000 (10:54 +0100)
Typo in first line:
The merge filter merges an array with [removed: the] another array
doc/filters/merge.rst
patch
|
blob
|
history
diff --git
a/doc/filters/merge.rst
b/doc/filters/merge.rst
index
4348e7a
..
05a2ae7
100644
(file)
--- a/
doc/filters/merge.rst
+++ b/
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