avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit StandardTestCase.java
Date Thu, 16 Oct 2003 03:57:51 GMT
mcconnell    2003/10/15 20:57:51

  Modified:    merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit
                        StandardTestCase.java
  Log:
  Resolve conflict on testcase.
  
  Revision  Changes    Path
  1.4       +2 -0      avalon/merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/StandardTestCase.java
  
  Index: StandardTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/StandardTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StandardTestCase.java	14 Oct 2003 10:55:57 -0000	1.3
  +++ StandardTestCase.java	16 Oct 2003 03:57:51 -0000	1.4
  @@ -61,6 +61,8 @@
   public class StandardTestCase extends AbstractMerlinTestCase
   {
   
  +    private static URL CONF = getProjectPath( "conf/cofig.xml", false );
  +
       //--------------------------------------------------------
       // constructors
       //--------------------------------------------------------
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message