diff options
| author | Release Engineers <releng@openoffice.org> | 2009-06-18 15:45:20 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-06-18 15:45:20 +0000 |
| commit | 16882a51e5e9249f7e8ab15e61d8ebd6b38ef3f3 (patch) | |
| tree | 2842b2f207e3a21c77aab4aaf286473316c63cc8 /svtools | |
| parent | 1a1e47157a98f0c3e00d8408cd69c7b3f9220911 (diff) | |
#i10000# removed conflict
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/inettbc.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 3c6522f051fa..4a01a03ad759 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() ) |