Browse Source

README.md编辑

程志平 5 years ago
parent
commit
f3e35f6bb7
1 changed files with 0 additions and 1 deletions
  1. 0 1
      README.md

+ 0 - 1
README.md

@@ -5,7 +5,6 @@
 ![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717183205026.png?download=false)
 
 2.洗浴页提示
-<<<<<<< HEAD
 
 ![image](https://chuanghaikeji.coding.net/p/smarCampus/d/waterElectricityMinApp/git/raw/master/readme-img/image-20210717183340973.png?download=false)