From 86c47ea1a6c018a3f362ec76f49a8841e82c247b Mon Sep 17 00:00:00 2001
From: Aaron Chen <wandoubaba517@gmail.com>
Date: Fri, 26 Nov 2021 08:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BA=86iss053=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 git/常用git命令.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/git/常用git命令.md b/git/常用git命令.md
index fd0a918..cbde9a6 100644
--- a/git/常用git命令.md
+++ b/git/常用git命令.md
@@ -26,8 +26,6 @@ git branch -a
 git checkout develop
 # 创建一个名为iss053的分支同时切换到这个新分支
 git checkout -b iss053
-<<<<<<< HEAD
-=======
 # 在iss053分支提交修改
 git commit -a -m "添加一些git分支操作"
 # 将iss053分支的变更合并到master分支
@@ -36,7 +34,6 @@ git merge iss053
 # 合并后可以删iss053分支
 git branch -d iss053
 # 在iss053上做了一些修改
->>>>>>> iss053
 ```
 
 ## 代码推拉