summaryrefslogtreecommitdiff
path: root/TAO/TAO-INSTALL.html
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/TAO-INSTALL.html')
-rw-r--r--TAO/TAO-INSTALL.html15
1 files changed, 2 insertions, 13 deletions
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 41f004eeaee..d581290c763 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -378,22 +378,11 @@ compiler), gperf, the orb services libraries, and the standalone
executables (such as Naming Service, etc.). It can be used to build
all the files needed to build/run TAO applications.</P>
-<<<<<<< TAO-INSTALL.html
-<H4>Visual C++ 7.1</H4> The DOC group doesn't support TAO on VC++ 7.0
-since the libraries that were shipped with VC++ 7.0 did not work
-well. The DOC group supports only VC++ 7.1, which is used by their
-sponsors. The following points are relevant to users who are trying to
-use TAO with VC++ 7.1.
-=======
<H4>Visual C++ 7.1</H4>
The DOC group doesn't support TAO on VC++ 7.0 since the libraries that
were shipped with VC++ 7.0 did not work well. The DOC group supports
-only VC++ 7.1, which is used by their sponsors. The above mentioned
-points are also relevant to users who are trying to use TAO with VC++
-7.1. Additionally, all required options are set for the generated .sln
-files. If something is missing then it is probably a bug with
-MPC. Please report such bugs to the tao-users newsgroups.
->>>>>>> 1.86
+only VC++ 7.1, which is used by their sponsors. The following points are
+relevant to users who are trying to use TAO with VC++ 7.1.
<H4>Borland C++ Builder</H4> <P>