From 8c8ee30ef866b249b430da37086fa356c7e82f2f Mon Sep 17 00:00:00 2001
From: kxdd <kxdd@ws123456.com>
Date: Fri, 6 Sep 2024 18:20:54 +0800
Subject: [PATCH] Merge branch 'develop' into ma

# Conflicts:
#	public
---
 .gitmodules | 3 ---
 public      | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 public

diff --git a/.gitmodules b/.gitmodules
index e7c37df..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "public"]
-	path = public
-	url = git@git.pogorockgames.com:mango-games/server/public.git
diff --git a/public b/public
deleted file mode 160000
index 00b9fce..0000000
--- a/public
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 00b9fce886af5b6a926aa804d3cad33be9ea0793