svn commit: r1580857 - /tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java

[dblevins]

Author: dblevins
Date: Mon Mar 24 13:57:37 2014
New Revision: 1580857

URL: http://svn.apache.org/r1580857
Log:
cleaning merge issue

Modified:
    
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java

Modified: 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java?rev=1580857&r1=1580856&r2=1580857&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java
 Mon Mar 24 13:57:37 2014
@@ -357,14 +357,10 @@ public class ObserverManager {
         }
     }
 
-<<<<<<< .mine
     public interface Invocation {
 
         void invoke(Object event);
-=======
-    public interface Invocation {
-        void invoke(Object event);
->>>>>>> .r1580853
+
     }