From a05678c31241122f2a9d69fcf5aea5ae9c4f3de1 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

---
 .gitattributes                    | 1 +
 dbaccess/Executable_odbcconfig.mk | 2 --
 dbaccess/Library_sdbt.mk          | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)
 create mode 120000 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 120000
index 000000000..f18402b73
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index cf39fde24..c84c2c4c0 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 0ca735892..cecbc00d0 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 v1.2.3