From: Cherian Mathew <c.mathew@bgbm.org>
Date: Fri, 5 Jun 2015 14:12:48 +0000 (+0200)
Subject: merged for gitflow plugin
X-Git-Tag: 3.6.0~2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/77e0343c10854fd159eccbe9caaf29f2c1286183

merged for gitflow plugin
---

diff --git a/pom.xml b/pom.xml
index fe14b1771..1913b2888 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,18 +327,6 @@
           <tagBase>http://dev.e-taxonomy.eu/svn/tags/taxeditor</tagBase>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>external.atlassian.jgitflow</groupId>
-        <artifactId>jgitflow-maven-plugin</artifactId>
-        <version>1.0-m4.3</version>
-        <configuration>
-          <pushHotfixes>true</pushHotfixes>
-          <pushReleases>true</pushReleases>
-          <enableSshAgent>true</enableSshAgent>
-          <allowSnapshots>true</allowSnapshots>
-          <allowUntracked>true</allowUntracked>
-        </configuration>
-      </plugin>
     </plugins>
     <extensions>
       <extension>