From 5cb1a4c202018e2cd77d081e72f65dd801a8ed9f Mon Sep 17 00:00:00 2001
From: lizhuo <lizhuo@qianyi.ai>
Date: Mon, 24 Jun 2024 18:43:39 +0800
Subject: [PATCH] =?UTF-8?q?doc=EF=BC=9A=E3=80=8A=E5=A6=82=E4=BD=95?=
 =?UTF-8?q?=E5=9C=A8Github=E4=B8=8A=E6=8F=90=E4=BA=A4PR=E3=80=8B=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E7=BC=BA=E5=B0=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 problems/qita/join.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/problems/qita/join.md b/problems/qita/join.md
index 62dec674..c7e17588 100644
--- a/problems/qita/join.md
+++ b/problems/qita/join.md
@@ -188,7 +188,7 @@ python代码
 大家提交代码的热情太高了，我有时候根本处理不过来，但我必须当天处理完，否则第二天代码冲突会越来越多。
 <div align="center"><img src='https://code-thinking-1253855093.file.myqcloud.com/pics/20210514091457392.png' width=500 alt=''></img></div>
 
-一天晚分别有两位录友提交了 30多道 java代码，全部冲突，解决冲突处理的我脖子疼[哭]
+一天晚上分别有两位录友提交了 30多道 java代码，全部冲突，解决冲突处理的我脖子疼[哭]
 
 那么在处理冲突的时候 保留谁的代码，删点谁的代码呢？