svn commit: r523407 - /incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java

[mriou]

Author: mriou
Date: Wed Mar 28 09:47:07 2007
New Revision: 523407

URL: http://svn.apache.org/viewvc?view=rev&rev=523407
Log:
Silly javadoc conflict.

Modified:
    
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java

Modified: 
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java?view=diff&rev=523407&r1=523406&r2=523407
==============================================================================
--- 
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java
 (original)
+++ 
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageExchangeDAO.java
 Wed Mar 28 09:47:07 2007
@@ -85,12 +85,8 @@
 
     /**
      * Set state of last message sent/received.
-<<<<<<< .mine
      *
      * @param status state to be set
-=======
-     * @param string state to be set
->>>>>>> .r511955
      */
     void setStatus(String status);