diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 12:15:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 12:15:08 +0100 |
| commit | 654cf6ce6726dd2fbb9bccc726e45910ab064a4c (patch) | |
| tree | 853dfbad7eea6bf44dce78771641715ff215bec0 | |
| parent | 5bf1c6b7723abeaa26260d2b56dbba6359038867 (diff) | |
remove conflict markers
| -rw-r--r-- | dbaccess/source/core/api/querydescriptor.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 2d1528f51..9dc68d41b 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 |