Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/production'
Browse files Browse the repository at this point in the history
# Conflicts:
#	bedwars-api/src/main/java/com/andrei1058/bedwars/api/server/RestoreAdapter.java
#	resetadapter_aswm/src/main/java/com/andrei1058/bedwars/arena/mapreset/slime/AdvancedSlimeAdapter.java
#	resetadapter_slime/src/main/java/com/andrei1058/bedwars/arena/mapreset/slime/SlimeAdapter.java
#	resetadapter_slimepaper/src/main/java/com/andrei1058/bedwars/arena/mapreset/slime/SlimePaperAdapter.java
#	versionsupport_v1_19_R3/pom.xml
#	versionsupport_v1_20_R1/pom.xml
#	versionsupport_v1_20_R2/pom.xml
  • Loading branch information
andrei1058 committed Nov 18, 2023
2 parents b664600 + 22f1a36 commit 13c2ccc
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 13c2ccc

Please sign in to comment.