From dd55739254d0b66cde9dc027a4f09e6478450add Mon Sep 17 00:00:00 2001
From: arch3rPro <wh1tecat@protonmail.com>
Date: Wed, 7 Jan 2026 17:07:44 +0800
Subject: [PATCH] feat: update n8n-zh 2.3.0

---
 apps/n8n-zh/{2.2.2 => 2.3.0}/data.yml             | 0
 apps/n8n-zh/{2.2.2 => 2.3.0}/data/.gitkeep        | 0
 apps/n8n-zh/{2.2.2 => 2.3.0}/docker-compose.yml   | 4 ----
 apps/n8n-zh/{2.2.2 => 2.3.0}/scripts/init.sh      | 0
 apps/n8n-zh/{2.2.2 => 2.3.0}/scripts/uninstall.sh | 0
 apps/n8n-zh/{2.2.2 => 2.3.0}/scripts/upgrade.sh   | 0
 6 files changed, 4 deletions(-)
 rename apps/n8n-zh/{2.2.2 => 2.3.0}/data.yml (100%)
 rename apps/n8n-zh/{2.2.2 => 2.3.0}/data/.gitkeep (100%)
 rename apps/n8n-zh/{2.2.2 => 2.3.0}/docker-compose.yml (73%)
 rename apps/n8n-zh/{2.2.2 => 2.3.0}/scripts/init.sh (100%)
 rename apps/n8n-zh/{2.2.2 => 2.3.0}/scripts/uninstall.sh (100%)
 rename apps/n8n-zh/{2.2.2 => 2.3.0}/scripts/upgrade.sh (100%)

diff --git a/apps/n8n-zh/2.2.2/data.yml b/apps/n8n-zh/2.3.0/data.yml
similarity index 100%
rename from apps/n8n-zh/2.2.2/data.yml
rename to apps/n8n-zh/2.3.0/data.yml
diff --git a/apps/n8n-zh/2.2.2/data/.gitkeep b/apps/n8n-zh/2.3.0/data/.gitkeep
similarity index 100%
rename from apps/n8n-zh/2.2.2/data/.gitkeep
rename to apps/n8n-zh/2.3.0/data/.gitkeep
diff --git a/apps/n8n-zh/2.2.2/docker-compose.yml b/apps/n8n-zh/2.3.0/docker-compose.yml
similarity index 73%
rename from apps/n8n-zh/2.2.2/docker-compose.yml
rename to apps/n8n-zh/2.3.0/docker-compose.yml
index fcb1640..28c6b6e 100644
--- a/apps/n8n-zh/2.2.2/docker-compose.yml
+++ b/apps/n8n-zh/2.3.0/docker-compose.yml
@@ -1,10 +1,6 @@
 services:
   n8n:
-<<<<<<<< HEAD:apps/n8n-zh/2.3.0/docker-compose.yml
     image: n8nio/n8n:2.3.0
-========
-    image: n8nio/n8n:2.2.2
->>>>>>>> 8e6cc572050a5c9325ed5d40b27a804e3b5f4032:apps/n8n-zh/2.2.2/docker-compose.yml
     container_name: ${CONTAINER_NAME}
     restart: always
     user: 1000:1000
diff --git a/apps/n8n-zh/2.2.2/scripts/init.sh b/apps/n8n-zh/2.3.0/scripts/init.sh
similarity index 100%
rename from apps/n8n-zh/2.2.2/scripts/init.sh
rename to apps/n8n-zh/2.3.0/scripts/init.sh
diff --git a/apps/n8n-zh/2.2.2/scripts/uninstall.sh b/apps/n8n-zh/2.3.0/scripts/uninstall.sh
similarity index 100%
rename from apps/n8n-zh/2.2.2/scripts/uninstall.sh
rename to apps/n8n-zh/2.3.0/scripts/uninstall.sh
diff --git a/apps/n8n-zh/2.2.2/scripts/upgrade.sh b/apps/n8n-zh/2.3.0/scripts/upgrade.sh
similarity index 100%
rename from apps/n8n-zh/2.2.2/scripts/upgrade.sh
rename to apps/n8n-zh/2.3.0/scripts/upgrade.sh