[ooo-build-commit] Branch 'ooo/master' - svtools/source

[Jan Holesovsky]

 svtools/source/control/inettbc.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit f611a32cb2f421fe645ca3d0e7d7d93d73f7744a
Author: Release Engineers <releng at openoffice.org>
Date:   Thu Jun 18 15:45:20 2009 +0000

    #i10000# removed conflict

diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 625b2bd..f0e7899 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -641,11 +641,7 @@ void SvtMatchContext_Impl::run()
     // if the user input is a valid URL, go on with it
     // otherwise it could be parsed smart with a predefined smart protocol
     // ( or if this is not set with the protocol of a predefined base URL )
-<<<<<<< .working
     if( eProt == INET_PROT_NOT_VALID || eProt == eSmartProt || (eSmartProt == INET_PROT_NOT_VALID && eProt == eBaseProt) )
-=======
-    if( eProt == INET_PROT_NOT_VALID || eProt == eSmartProt || (eSmartProt == INET_PROT_NOT_VALID && eProt == eBaseProt) )
->>>>>>> .merge-right.r272982
     {
         // not stopped yet ?
         if( schedule() )