From 6b9a47146503810e23a770f7ea735c89734b5d17 Mon Sep 17 00:00:00 2001 From: veypi Date: Sun, 15 May 2022 07:18:25 +0000 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e2ed52c..332ef9e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ # nvim -my vim cfg \ No newline at end of file +my vim cfg + +merge test +1 +12 +3 +4 \ No newline at end of file