From 63b9b9e47b75ddcbf1ebf6fd066977cd47cd615e Mon Sep 17 00:00:00 2001
From: jon-lee <jon-lee@sjtu.edu.cn>
Date: Thu, 27 Feb 2025 16:18:56 +0800
Subject: [PATCH] docs(README): fix typo

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index ccbdef7..8ad7169 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,6 @@
 4. Install deps by `pdm install && pdm run pre-commit install`
 5. Run the cli app by `pdm run app --help`
 6. Check other commands or scripts with `pdm run --list`
-<<<<<<< HEAD
 
 ## How to use?
 
@@ -38,5 +37,3 @@
 ```shell
 joj3-config-generator convert /home/tt/.config/joj
 ```
-=======
->>>>>>> master