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 | c00fe9ce1105c6c2a26954eeaee5e51336909a2a (patch) | |
| tree | f7bfee68da7209c739f6b626696298b7fc03a54d | |
| parent | ea191d728fd1a3901515c4694be4b7f2416feca6 (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 000000000000..f18402b73cb9 --- /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 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: |