From 11183898d76bd2e171e04a57b0174c2b2be33036 Mon Sep 17 00:00:00 2001
From: hainuo <admin@hainuo.info>
Date: Sun, 10 Jul 2016 13:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E5=A4=84=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=90=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修正一处函数名拼写错误
---
 library/think/Route.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/Route.php b/library/think/Route.php
index 59cc72ee..b8894d86 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -199,7 +199,7 @@ class Route
                 if (is_array($val)) {
                     $route    = $val[0];
                     $option1  = array_merge($option, $val[1]);
-                    $pattern1 = array_merege($pattern, isset($val[2]) ? $val[2] : []);
+                    $pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []);
                 } else {
                     $route = $val;
                 }