User: fleury
Date: 00/08/24 19:27:37
Modified: src/main/org/jboss/ejb/plugins
RandomEntityInstanceCache.java
Log:
ooops
Revision Changes Path
1.7 +2 -2
jboss/src/main/org/jboss/ejb/plugins/RandomEntityInstanceCache.java
Index: RandomEntityInstanceCache.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/RandomEntityInstanceCache.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RandomEntityInstanceCache.java 2000/08/25 02:03:37 1.6
+++ RandomEntityInstanceCache.java 2000/08/25 02:27:37 1.7
@@ -29,12 +29,12 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
-* @version $Revision: 1.6 $
+* @version $Revision: 1.7 $
*/
public class RandomEntityInstanceCache
extends NoPassivationEntityInstanceCache
{
-<<<<<<< RandomEntityInstanceCache.java
+
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
