fix

jiaopengzi · jiaopengzi · commit 8de0ea7b4e75 · 2024-11-01T10:19:21.000+08:00
diff --git a/README.md b/README.md
@@ -49,11 +49,6 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=1024
 
 ### 2、自动编译
 
-<<<<<<< HEAD
-=======
-**注意编译全程需要全局走梯子**
->>>>>>> 2d7e67ec88a0281104f0f9a3aab4169a389e121b
-
 下载脚本到本地
 
 ```shell
