From 4881672ed5904bec8b8979e252f812a47869ccc8 Mon Sep 17 00:00:00 2001
From: xgqfrms <xgqfrms@outlook.com>
Date: Thu, 27 Oct 2022 18:57:47 +0800
Subject: [PATCH] Update git-merge-conflict.md

---
 git-merge-conflict.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-merge-conflict.md b/git-merge-conflict.md
index d23c951..07ca5dd 100644
--- a/git-merge-conflict.md
+++ b/git-merge-conflict.md
@@ -1,3 +1,3 @@
 # git merge
 
-<!-- todo -->
+merge conflicts