diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-09 09:47:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-09 09:47:47 +0000 |
| commit | ca3d0f3d0f9a6168ecf35c25d535344b049ec764 (patch) | |
| tree | 005ae0dc3cb6e541f751f5c0c4a99b25c87d5dea /desktop | |
| parent | 3fac870aa793f5b4e3053b63614ca22b455f7f62 (diff) | |
#i79377# Syntax (badly resolved merge conflict).
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 4697f358c122..54968eae70a3 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dp_dependencies.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2007-07-06 09:54:48 $ + * last change: $Author: rt $ $Date: 2007-07-09 10:47:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -101,7 +101,7 @@ check(::dp_misc::DescriptionInfoset const & infoset) { ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("value"))), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2.3"))) - != ::dp_misc::GREATER))) + != ::dp_misc::GREATER)) { sat = satisfiesMinimalVersion( e->getAttribute( |