svn commit: r667434 - /webservices/axis2/trunk/c/xdocs/docs/axis2c_manual.html

[du...@apache.org]

Author: dushshantha
Date: Fri Jun 13 02:18:13 2008
New Revision: 667434

URL: http://svn.apache.org/viewvc?rev=667434&view=rev
Log: (empty)

Modified:
    webservices/axis2/trunk/c/xdocs/docs/axis2c_manual.html

Modified: webservices/axis2/trunk/c/xdocs/docs/axis2c_manual.html
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xdocs/docs/axis2c_manual.html?rev=667434&r1=667433&r2=667434&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xdocs/docs/axis2c_manual.html (original)
+++ webservices/axis2/trunk/c/xdocs/docs/axis2c_manual.html Fri Jun 13 02:18:13 2008
@@ -1592,7 +1592,6 @@
 <pre>nmake axis2_iis_module</pre>
 </div>
 <p>In this document I assume that the mod_axis2_IIS.dll
-<<<<<<< .mine
 is in the directory <code>c:\axis2c\lib</code> and AXIS2C_HOME
 is <code>c:\axis2c</code></p><p>Add the following key to the
 registery.</p><p><code>HKEY_LOCAL_MACHINE\SOFTWARE\Apache Axis2c\IIS ISAPI
@@ -1694,7 +1693,6 @@
 by configuring Axis2/C with the <code>--enable-openssl=yes</code>
 option.</p>
 <p>Example <code><br />
->>>>>>> .theirs
 %./configure --enable-openssl=yes --prefix=${AXIS2C_HOME}/deploy<br />
 %make<br />
 %make install<br />