From 7d24bbe67d3ce75814fc45918c58549d03161a25 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 12 Jan 2015 20:08:41 +1100
Subject: [PATCH] Upstream merge.

---
 CraftBukkit-Patches/0001-POM-Changes.patch | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
index e09ad5d1d8..6b4c453275 100644
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -37,11 +37,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    <relativePath>../pom.xml</relativePath>
 +  </parent>
 +
-   <repositories>
-       <repository>
-           <id>sonatype-nexus-snapshots</id>
-@@ -0,0 +0,0 @@
- 
    <dependencies>
      <dependency>
 -      <groupId>org.bukkit</groupId>
@@ -71,7 +66,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          </configuration>
          <executions>
            <execution>
-+            <id>ex-spigot</id>            
++            <id>ex-spigot</id>
 +            <configuration>
 +              <outputPrefix>git-Spigot-</outputPrefix>
 +              <outputPostfix></outputPostfix>
@@ -84,7 +79,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            </goals>
 +          </execution>
 +          <execution>
-+            <id>ex-craftbukkit</id>            
++            <id>ex-craftbukkit</id>
 +            <configuration>
 +              <outputPrefix>-</outputPrefix>
 +              <outputPostfix></outputPostfix>