Summary
- Fix merge conflicts (details)
The file was modified | CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch |
The file was modified | CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch |
The file was modified | CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch |
The file was modified | CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch |