diff --git a/README.md b/README.md index fac885b..873989e 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,6 @@ |Tasmota|2|HomeAssistant|3|-|1|-|1| |-|1|-|1|-|1|-|1| |-|1|-|1|-|1|-|1| -<<<<<<< HEAD # 最近更新 @@ -64,16 +63,10 @@ ![NodeRed_B](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/NodeRed_B.png) ![MT-Photos](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/MT-Photos.png) ![HomeAssistant](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/HA_A.png) -======= -|-|1|-|1|-|1|-|1| - -# 最近更新 - ![Jackett](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Jackett.png) ![Flood](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Flood_A.png) ![Ombi](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Ombi_A.png) ![迅雷](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Xunlei.png) ->>>>>>> 22c7add12f54fdd988417a8d67c5db94edef7925 ![DDNS](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/DDNS.png) ![TailScale](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Tailscale.png) ![Adguard](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Adguard_B.png) @@ -81,5 +74,4 @@ ![Qinglong](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Qinglong_B.png) ![Jellyseerr](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Jellyseerr.png) ![Openwrt](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Openwrt_B.png) -![Overseerr](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Overseerr.png) - +![Overseerr](https://ghproxy.com/https://raw.githubusercontent.com/xushier/HD-Icons/main/border-radius/Overseerr.png) \ No newline at end of file