portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r220243 - /portals/jetspeed-2/trunk/jetspeed-components.xml
Date Fri, 22 Jul 2005 05:56:41 GMT
Author: taylor
Date: Thu Jul 21 22:56:39 2005
New Revision: 220243

URL: http://svn.apache.org/viewcvs?rev=220243&view=rev
Log:
some kind of merge conflict, trying again

Modified:
    portals/jetspeed-2/trunk/jetspeed-components.xml

Modified: portals/jetspeed-2/trunk/jetspeed-components.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-components.xml?rev=220243&r1=220242&r2=220243&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-components.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-components.xml Thu Jul 21 22:56:39 2005
@@ -80,16 +80,6 @@
 	        </properties>
 		</dependency>
 		<dependency>
-			<id>jetspeed-header-resource</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>        
-		<dependency>
 			<id>jetspeed-search</id>
 			<groupId>jetspeed2</groupId>
 			<version>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message