10.15

2025-10-30 17:53:41 +01:00
parent 15b7d69f10
commit 5ccedd1738
1 changed files with 0 additions and 4 deletions
@@ -7,11 +7,7 @@
 ## X-Website: https://github.com/cinecom/shootyepgp/
 ## X-Category: Guild
 ## X-Credits: shooty, Qcat(zhCN)
-<<<<<<< HEAD
 ## Version: 10.15 <ERROR>
-=======
-## Version: 10.14 <ERROR>
->>>>>>> 4dda482e881a603c58714ccc3f548c5c53eb30bf
 ## X-Alpha: 
 ## OptionalDeps: Ace2
 ## SavedVariables: sepgp_saychannel, sepgp_groupbyclass, sepgp_groupbyarmor, sepgp_groupbyrole, sepgp_raidonly, sepgp_dbver, sepgp_debug, sepgp_fubar, sepgp_sound