From 9feb5f5068dc5f9ab689f36e0cda288480d122a9 Mon Sep 17 00:00:00 2001
From: arch3rPro <wh1tecat@protonmail.com>
Date: Wed, 7 Jan 2026 17:18:59 +0800
Subject: [PATCH] feat: update New-API 0.10.5

---
 apps/new-api/{0.10.4 => 0.10.5-allinone}/data.yml           | 0
 apps/new-api/{0.10.4 => 0.10.5-allinone}/docker-compose.yml | 0
 apps/new-api/{0.10.3 => 0.10.5}/data.yml                    | 0
 apps/new-api/{0.10.3 => 0.10.5}/docker-compose.yml          | 4 ----
 4 files changed, 4 deletions(-)
 rename apps/new-api/{0.10.4 => 0.10.5-allinone}/data.yml (100%)
 rename apps/new-api/{0.10.4 => 0.10.5-allinone}/docker-compose.yml (100%)
 rename apps/new-api/{0.10.3 => 0.10.5}/data.yml (100%)
 rename apps/new-api/{0.10.3 => 0.10.5}/docker-compose.yml (68%)

diff --git a/apps/new-api/0.10.4/data.yml b/apps/new-api/0.10.5-allinone/data.yml
similarity index 100%
rename from apps/new-api/0.10.4/data.yml
rename to apps/new-api/0.10.5-allinone/data.yml
diff --git a/apps/new-api/0.10.4/docker-compose.yml b/apps/new-api/0.10.5-allinone/docker-compose.yml
similarity index 100%
rename from apps/new-api/0.10.4/docker-compose.yml
rename to apps/new-api/0.10.5-allinone/docker-compose.yml
diff --git a/apps/new-api/0.10.3/data.yml b/apps/new-api/0.10.5/data.yml
similarity index 100%
rename from apps/new-api/0.10.3/data.yml
rename to apps/new-api/0.10.5/data.yml
diff --git a/apps/new-api/0.10.3/docker-compose.yml b/apps/new-api/0.10.5/docker-compose.yml
similarity index 68%
rename from apps/new-api/0.10.3/docker-compose.yml
rename to apps/new-api/0.10.5/docker-compose.yml
index fe3c7f9..61ea749 100644
--- a/apps/new-api/0.10.3/docker-compose.yml
+++ b/apps/new-api/0.10.5/docker-compose.yml
@@ -1,10 +1,6 @@
 services:
   new-api:
-<<<<<<<< HEAD:apps/new-api/0.10.5/docker-compose.yml
     image: calciumion/new-api:v0.10.5
-========
-    image: calciumion/new-api:v0.10.4
->>>>>>>> 8e6cc572050a5c9325ed5d40b27a804e3b5f4032:apps/new-api/0.10.3/docker-compose.yml
     container_name: ${CONTAINER_NAME}
     restart: always
     ports: