Changes

Summary

  1. Fix merge conflicts. (details)
Commit d6b5ba7ca0347b63ea65ce574463903baaa382f7 by md_5 (md_5)
Fix merge conflicts.
The file was modifiedCraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
The file was modifiedBukkit-Patches/0023-Expand-team-API-to-allow-arbitrary-strings.patch
The file was modifiedCraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
The file was modifiedBukkit-Patches/0002-Spigot-Timings.patch