[Libreoffice-commits] .: sc/source

[Thomas Arnhold]

 sc/source/ui/unoobj/fielduno.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 3885454ea4c8fa148c149f32d78aca17c62aa55d
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Mar 2 16:39:01 2011 +0100

    Remove diff stuff

diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 83526c0..9028a06 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -1034,10 +1034,6 @@ void SAL_CALL ScHeaderFieldsObj::refresh(  )
                     }
                     catch(uno::RuntimeException&)
                     {
-<<<<<<< HEAD
-=======
-//						OSL_FAIL("a object is gone without to remove from Broadcaster");
->>>>>>> Move DBG_ERROR to OSL_FAIL
                         ++pInterfaces;
                         ++i;
                     }