Skip to content
Jenkins
log in
Dashboard
RSS
Bukkit-RSS
#32
Back to Project
Status
Changes
Console Output
View Build Information
Polling Log
Git Build Data
Previous Build
Next Build
Changes
Summary
Fix merge conflicts (
details
)
Commit d0d1d8761a1854ce51a8a36174f7a92bd8e98df1 by
Thinkofdeath (Thinkofdeath)
Fix merge conflicts
CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
![[Jenkins]](/jenkins/static/3bb83b28/images/svgs/logo.svg){kind=logo}
