From c00fe9ce1105c6c2a26954eeaee5e51336909a2a Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat, 18 Jun 2011 14:12:16 +0200
Subject: fixing rebase errors

---
 dbaccess/Executable_odbcconfig.mk | 2 --
 dbaccess/Library_sdbt.mk          | 1 -
 2 files changed, 3 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index cf39fde24203..c84c2c4c0079 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -53,5 +53,3 @@ $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\
 ))
 
 # vim: set noet sw=4 ts=4:
-endif
-# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 0ca735892463..cecbc00d067f 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -65,4 +65,3 @@ $(eval $(call gb_Library_add_noexception_objects,sdbt, \
 ))
 
 # vim: set noet sw=4 ts=4:
-# vim: set noet sw=4 ts=4:
-- 
cgit