appbase 合并 winboll

2025-09-28 14:53:17 +08:00
parent e9bb789daa 58369560b9
commit ce131235c1
89 changed files with 4817 additions and 4 deletions
--- a/settings.gradle-demo
+++ b/settings.gradle-demo
@@ -50,6 +50,7 @@
 //include ':androidxdemo'
 //rootProject.name = "androidxdemo"

+<<<<<<< HEAD
 // Ollama 项目编译设置
 //include ':ollama'
 //rootProject.name = "ollama"
@@ -64,4 +65,10 @@

 // WebPageSources 项目编译设置
 //include ':webpagesources'
-//rootProject.name = "webpagesources"
+//rootProject.name = "webpagesources"
+=======
+
+// WinBoLL 项目编译设置
+//include ':winboll'
+//rootProject.name = "winboll"
+>>>>>>> refs/heads/winboll