diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-27 14:50:30 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-27 14:50:30 +0000 |
| commit | 78ef2366384f3ac8e2af34bb796480dc881f71e6 (patch) | |
| tree | 72b15b7f793a5a06ba1770b1b340658243ccc271 /testtools | |
| parent | 4b48e6a3c5fabf310f5ec7fd657488ac951561f3 (diff) | |
#i10000# remove conflict marker
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx index c84a11ab7f77..9adda95d5883 100644 --- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx +++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx @@ -1,6 +1,5 @@ /************************************************************************* * -<<<<<<< cli_cpp_bridgetest.cxx * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2008 by Sun Microsystems, Inc. @@ -8,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cli_cpp_bridgetest.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -34,7 +33,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cli_cpp_bridgetest.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * |