Author: nickboldt Date: 2011-09-27 11:19:36 -0400 (Tue, 27 Sep 2011) New Revision: 35061 Modified: trunk/central/features/org.jboss.tools.central.feature/pom.xml Log: fix feature pom.xml Modified: trunk/central/features/org.jboss.tools.central.feature/pom.xml =================================================================== --- trunk/central/features/org.jboss.tools.central.feature/pom.xml 2011-09-27 15:15:59 UTC (rev 35060) +++ trunk/central/features/org.jboss.tools.central.feature/pom.xml 2011-09-27 15:19:36 UTC (rev 35061) @@ -1,23 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<<<<<<< Updated upstream <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -======= -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> ->>>>>>> Stashed changes <parent> <groupId>org.jboss.tools.central</groupId> <artifactId>features</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.central.features</groupId> -<<<<<<< Updated upstream - <artifactId>org.jboss.tools.central.feature</artifactId> -======= <artifactId>org.jboss.tools.central.feature</artifactId> ->>>>>>> Stashed changes - <packaging>eclipse-feature</packaging> </project>