From: carlwitt <carl.witt@fu-berlin.de>
Date: Mon, 4 Mar 2013 09:54:34 +0000 (+0100)
Subject: Update merge.rst
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=59d0eed9f7fae1d905342e650a45fcefabb2768b;p=web%2Fkonrad%2Ftwig.git

Update merge.rst

Typo in first line:
The merge filter merges an array with [removed: the] another array
---

diff --git a/doc/filters/merge.rst b/doc/filters/merge.rst
index 4348e7a..05a2ae7 100644
--- 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