updating develop poms to master versions to avoid merge conflicts

[taxeditor.git] / eu.etaxonomy.taxeditor.feature / .project

diff --git a/eu.etaxonomy.taxeditor.feature/.project b/eu.etaxonomy.taxeditor.feature/.project
index 35ce558dcf28945b350b9a067d89e43bb7d5833d..7e46fa237167397c1f9a1b410ec60911d51a145d 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/.project
+++ b/eu.etaxonomy.taxeditor.feature/.project
@@ -1,6 +1,6 @@
 <projectDescription>
   <name>eu.etaxonomy.taxeditor.feature</name>
 <projectDescription>
   <name>eu.etaxonomy.taxeditor.feature</name>

-  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+  <comment></comment>

   <projects>
     <project>eu.etaxonomy.taxeditor.application</project>
     <project>eu.etaxonomy.taxeditor.bulkeditor</project>
   <projects>
     <project>eu.etaxonomy.taxeditor.application</project>
     <project>eu.etaxonomy.taxeditor.bulkeditor</project>


@@ -11,13 +11,14 @@
     <project>eu.etaxonomy.taxeditor.printpublisher</project>
     <project>eu.etaxonomy.taxeditor.store</project>
   </projects>
     <project>eu.etaxonomy.taxeditor.printpublisher</project>
     <project>eu.etaxonomy.taxeditor.store</project>
   </projects>

-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.pde.PluginNature</nature>
-  </natures>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.FeatureBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.FeatureNature</nature>
+       </natures>

 </projectDescription>
\ No newline at end of file
 </projectDescription>
\ No newline at end of file