mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix merge conflicts.

Browse source
This commit is contained in:
md_5 2015-01-25 10:37:00 +11:00 • committed by Zach Brown
parent 65491ca84d
commit 86c8d0492a
15 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch
View file

@ -1,4 +1,4 @@
From 0360a12d5bbf44b37e3266777b7032c4e158a69d Mon Sep 17 00:00:00 2001
From f6f824b0262999be08524092751f162b2cb75f61 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 24 Dec 2013 10:14:25 +1100
Subject: [PATCH] Fix Tab Completion for Some Commands
@ -22,10 +22,10 @@ index b888da1..e21d167 100644
+ // Spigot End
}
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
index fb3c90f..a08ae80 100644
index eb018f1..c70d512 100644
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
@@ -25,4 +25,12 @@ public class ReloadCommand extends BukkitCommand {
@@ -27,4 +27,12 @@ public class ReloadCommand extends BukkitCommand {
return true;
}