[Libreoffice-commits] .: dbaccess/source

[Caolán McNamara]

 dbaccess/source/core/api/querydescriptor.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 654cf6ce6726dd2fbb9bccc726e45910ab064a4c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 13 12:15:08 2010 +0100

    remove conflict markers

diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index 2d1528f..9dc68d4 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -280,8 +280,4 @@ OColumn* OQueryDescriptor_Base::createColumn( const ::rtl::OUString& /*_rName*/
     return NULL;
 }
 
-<<<<<<< HEAD
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-=======
-}	// namespace dbaccess
->>>>>>> Removed comments, trailing spaces and death code