From acfc7ba3e292c0d2c2f3935f56d63486fdc0bab8 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Mon, 1 Sep 2014 15:17:42 -0500
Subject: [PATCH] Rebuild patches after merge

---
 Spigot-Server-Patches/Temporary-fix-for-rails-dupe.patch | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Spigot-Server-Patches/Temporary-fix-for-rails-dupe.patch b/Spigot-Server-Patches/Temporary-fix-for-rails-dupe.patch
index 48b5688bc..520c0c603 100644
--- a/Spigot-Server-Patches/Temporary-fix-for-rails-dupe.patch
+++ b/Spigot-Server-Patches/Temporary-fix-for-rails-dupe.patch
@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java
 @@ -0,0 +0,0 @@ public abstract class BlockMinecartTrackAbstract extends Block {
              }
-
+ 
              if (flag) {
 -                this.b(world, i, j, k, world.getData(i, j, k), 0);
 -                world.setAir(i, j, k);
@@ -23,6 +23,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              } else {
                  this.a(world, i, j, k, l, i1, block);
              }
---
-1.9.4.msysgit.0
-
+--
\ No newline at end of file