[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejbEnterpriseContext.java

[jBoss CVS Development]

  User: fleury  
  Date: 00/09/26 12:23:15

  Modified:    src/main/org/jboss/ejb EnterpriseContext.java
  Log:
  Ooops
  
  Revision  Changes    Path
  1.9       +2 -2      jboss/src/main/org/jboss/ejb/EnterpriseContext.java
  
  Index: EnterpriseContext.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EnterpriseContext.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EnterpriseContext.java    2000/09/26 19:05:16     1.8
  +++ EnterpriseContext.java    2000/09/26 19:23:14     1.9
  @@ -1,4 +1,4 @@
  -<<<<<<< EnterpriseContext.java
  +
   /*
    * jBoss, the OpenSource EJB server
    *
  @@ -36,7 +36,7 @@
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.8 $
  + *   @version $Revision: 1.9 $
    */
   public abstract class EnterpriseContext
   {