twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 18:22:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts.

Browse Source
This commit is contained in:
md_5
2015-02-15 12:52:33 +11:00
parent 00c4207874
commit 06faae935f
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CraftBukkit-Patches/0127-Better-item-validation.patch
View File

@@ -105,8 +105,8 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -0,0 +0,0 @@ import com.google.common.collect.Sets;
import java.util.Arrays;
@@ -0,0 +0,0 @@ import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
+// Spigot start