Merge: 合并远程仓库更新，采纳远程版本选择

2026-05-10 11:11:39 +08:00 · 2026-01-07 16:26:03 +08:00
parent e07ca5afaf 8e6cc57205
commit a73d23890f
28 changed files with 1047 additions and 3 deletions
@@ -1,6 +1,10 @@
 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