portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/components/jetspeed/test/WEB-INF/conf container.groovy
Date Mon, 22 Mar 2004 20:58:43 GMT
taylor      2004/03/22 12:58:43

  Modified:    components/jetspeed/test/WEB-INF/conf container.groovy
  Log:
  more merge conflicts on license
  
  Revision  Changes    Path
  1.3       +0 -1      jakarta-jetspeed-2/components/jetspeed/test/WEB-INF/conf/container.groovy
  
  Index: container.groovy
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/jetspeed/test/WEB-INF/conf/container.groovy,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- container.groovy	18 Mar 2004 19:17:32 -0000	1.2
  +++ container.groovy	22 Mar 2004 20:58:43 -0000	1.3
  @@ -14,7 +14,6 @@
    * limitations under the License.
    * ========================================================================
    */
  -
   import org.apache.jetspeed.cps.template.TemplateLocatorComponentImpl
   import org.picocontainer.defaults.DefaultPicoContainer
   import org.apache.jetspeed.components.ComponentAssemblyTestCase
  
  
  

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


Mime
View raw message