Changes

Summary

  1. Fix merge conflicts (details)
Commit d0d1d8761a1854ce51a8a36174f7a92bd8e98df1 by Thinkofdeath (Thinkofdeath)
Fix merge conflicts
The file was modifiedCraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
The file was modifiedCraftBukkit-Patches/0003-Skeleton-API-Implementations.patch