Merge branch 'main' of https://git.solsynth.dev/nanci/SolianForPython

2025-09-13 15:23:59 +08:00
parent 831fd6e835 967cea4c47
commit 6406e98a29
18 changed files with 1159 additions and 10 deletions
--- a/core/SNAPI/init.py
+++ b/core/SNAPI/init.py
@@ -1 +1,5 @@
+<<<<<<< HEAD
 from . import Chat, Poll, Post,PostCategory,PostTag,Publisher,WebArticle,WebFeed,WebFeedPublic,WebReader,Sticker,CallServer,Realm,RealtimeCall
+=======
+from . import Chat, Poll, Post,PostCategory,PostTag,Publisher,WebArticle,WebFeed,WebFeedPublic,WebReader,Sticker,CallServer,Realm,RealtimeCall
+>>>>>>> 967cea4c47a481e79c92fda0760c423de7fbcedf