合并本地与远程代码

2 months ago · 3bb4dfacd4
parent 5aea9c39c0 626e5f869e
commit 3bb4dfacd4
1 changed files with 4 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -4,11 +4,15 @@

 ## 🚀 快速开始

+<<<<<<< HEAD
 1. **克隆项目**
    ```bash
    git clone https://github.com/yourname/style_transfer_ai.git
    cd style_transfer_ai1
    ```
+=======
+1.**项目介绍**
+>>>>>>> 626e5f869ec0cab1cc44a7f603dcaedb22fd4cce

 2. **创建虚拟环境并安装依赖**
    ```bash