cvs commit: avalon/merlin/kernel/loader/src/java/org/apache/avalon/merlin KernelDefaults.java

[akarasulu]

akarasulu    2003/11/03 08:29:01

  Modified:    merlin/kernel/loader/src/java/org/apache/avalon/merlin
                        KernelDefaults.java
  Log:
  Conflict resolved.
  
  Revision  Changes    Path
  1.8       +3 -2      
avalon/merlin/kernel/loader/src/java/org/apache/avalon/merlin/KernelDefaults.java
  
  Index: KernelDefaults.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/merlin/kernel/loader/src/java/org/apache/avalon/merlin/KernelDefaults.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- KernelDefaults.java       3 Nov 2003 16:14:03 -0000       1.7
  +++ KernelDefaults.java       3 Nov 2003 16:29:01 -0000       1.8
  @@ -700,7 +700,8 @@
       {
           try 
           {
  -            final String userRepoEnv = Env.getEnvVariable( MERLIN_REPO_LOCAL_ENV );
  +            final String userRepoEnv = 
  +                Env.getEnvVariable( MERLIN_REPO_LOCAL_ENV );
               if( userRepoEnv != null )
               {
                   return new File( userRepoEnv ) ;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]