From b153ad3e9be95e7f0e2e883b22926a096760ba82 Mon Sep 17 00:00:00 2001
From: bbende <bbende@gmail.com>
Date: Sun, 26 Apr 2015 16:05:19 -0400
Subject: [PATCH] Fixing merge conflicts.

---
 nifi/nifi-assembly/pom.xml |  1 -
 nifi/pom.xml               | 54 --------------------------------------
 2 files changed, 55 deletions(-)

diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml
index 0cc076a6a4..f25f0a12d0 100644
--- a/nifi/nifi-assembly/pom.xml
+++ b/nifi/nifi-assembly/pom.xml
@@ -193,7 +193,6 @@ language governing permissions and limitations under the License. -->
             <type>nar</type>
         </dependency>
     </dependencies>
->>>>>>> upstream/develop
 
     <properties>
         <!--Wrapper Properties -->
diff --git a/nifi/pom.xml b/nifi/pom.xml
index cac9def9fa..0f6b607a46 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -496,10 +496,6 @@
                 <artifactId>avro</artifactId>
                 <version>1.7.6</version>
             </dependency>
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/develop
             <dependency>
                 <groupId>com.sun.jersey</groupId>
                 <artifactId>jersey-server</artifactId>
@@ -866,56 +862,6 @@
         </pluginManagement>
         <plugins>
             <plugin>
-<<<<<<< HEAD
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.5</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>repository.apache.org</serverId>
-                    <nexusUrl>https://repository.apache.org/</nexusUrl>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireSameVersions>
-                                    <plugins>
-                                        <plugin>org.apache.maven.plugins:maven-surefire-plugin</plugin>
-                                        <plugin>org.apache.maven.plugins:maven-failsafe-plugin</plugin>
-                                        <plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
-                                    </plugins>
-                                </requireSameVersions>
-                                <requireMavenVersion>
-                                    <version>${maven.min-version}</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>nb-configuration.xml</exclude> <!-- courtesy excludes for netbeans users -->
-                        <exclude>nbactions.xml</exclude> <!-- courtesy excludes for netbeans users -->
-                        <exclude>DEPENDENCIES</exclude> <!-- auto generated file by apache's maven config while building sources.zip -->
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-=======
->>>>>>> upstream/develop
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-nar-maven-plugin</artifactId>
                 <version>1.0.1-incubating-SNAPSHOT</version>