You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/12/15 15:12:11 UTC
svn commit: r357016 - /webservices/axis/trunk/c/src/engine/Axis.cpp
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