cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-08-07 18:45:12 -04:00
committed by GitHub
parent beac7813d8
commit f6459be162
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/custom_sprites.txt
-7
View File
@@ -1,10 +1,3 @@
<<<<<<< HEAD
ckey|state
lunarfleet|Clea-Nor
jademanique|B.A.U-Kingside
=======
ckey|state
lunarfleet|Clea-Nor
jademanique|B.A.U-Kingside
argonne|RUSS
>>>>>>> 046f0e3e98... Merge pull request #13450 from Astra-Quark/master