Author: sboscarine Date: 2010-07-17 12:12:56 -0400 (Sat, 17 Jul 2010) New Revision: 6692 Modified: archetypes/javaee6-webapp/trunk/pom.xml Log: fix merge error? Modified: archetypes/javaee6-webapp/trunk/pom.xml =================================================================== --- archetypes/javaee6-webapp/trunk/pom.xml 2010-07-17 16:12:18 UTC (rev 6691) +++ archetypes/javaee6-webapp/trunk/pom.xml 2010-07-17 16:12:56 UTC (rev 6692) @@ -226,7 +226,6 @@ <fileName>${project.build.directory}/${project.build.finalName}.war</fileName> <!-- JNDI Datasource that connects to in-memory HSQLDB to demonstrate JPA --> <fileName>src/main/resources-jbossas/default-ds.xml</fileName> - <fileName>${project.build.directory}/${project.build.finalName}.war</fileName> </fileNames> </configuration> </plugin>