From 885f4094d6bd7b61a0412180673e97a9e012645d Mon Sep 17 00:00:00 2001
From: Qihua Dai <278591289@qq.com>
Date: Fri, 14 Dec 2018 15:55:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=B2=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../\345\275\222\345\271\266\346\216\222\345\272\217.py"    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git "a/Python\347\256\227\346\263\225\345\255\246\344\271\240/\345\275\222\345\271\266\346\216\222\345\272\217.py" "b/Python\347\256\227\346\263\225\345\255\246\344\271\240/\345\275\222\345\271\266\346\216\222\345\272\217.py"
index 0e0b265..b519b96 100644
--- "a/Python\347\256\227\346\263\225\345\255\246\344\271\240/\345\275\222\345\271\266\346\216\222\345\272\217.py"
+++ "b/Python\347\256\227\346\263\225\345\255\246\344\271\240/\345\275\222\345\271\266\346\216\222\345\272\217.py"
@@ -16,11 +16,11 @@ def merge(left, right):
     l, r = 0, 0
     result = []
     while l < len(left) and r < len(right):
-        if ls[l] < ls[r]:
-            result.append(ls[l])
+        if left[l] < right[r]:
+            result.append(left[l])
             l += 1
         else:
-            result.append(ls[r])
+            result.append(right[r])
             r += 1
     result += left[l:]
     result += right[r:]