axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From di...@apache.org
Subject svn commit: r357016 - /webservices/axis/trunk/c/src/engine/Axis.cpp
Date Thu, 15 Dec 2005 14:12:11 GMT
Author: dicka
Date: Thu Dec 15 06:12:06 2005
New Revision: 357016

URL: http://svn.apache.org/viewcvs?rev=357016&view=rev
Log:
Correcting accidental inclusion of merge tags.

Modified:
    webservices/axis/trunk/c/src/engine/Axis.cpp

Modified: webservices/axis/trunk/c/src/engine/Axis.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/engine/Axis.cpp?rev=357016&r1=357015&r2=357016&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/Axis.cpp (original)
+++ webservices/axis/trunk/c/src/engine/Axis.cpp Thu Dec 15 06:12:06 2005
@@ -801,9 +801,4 @@
     			;
         }
     }
-<<<<<<< .mine
 }
-=======
-}
-
->>>>>>> .r357010



Mime
View raw message