diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
| commit | a05678c31241122f2a9d69fcf5aea5ae9c4f3de1 (patch) | |
| tree | db33a3c0da27c8449fc740fbdece03aea5984210 | |
| parent | 406dcf217456ff9689ca9f75e06b65026bbe37e8 (diff) | |
fixing rebase errors
| l--------- | .gitattributes | 1 | ||||
| -rw-r--r-- | dbaccess/Executable_odbcconfig.mk | 2 | ||||
| -rw-r--r-- | dbaccess/Library_sdbt.mk | 1 |
3 files changed, 1 insertions, 3 deletions
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: |