Kaydet (Commit) c00fe9ce authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen

fixing rebase errors

üst ea191d72
/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file
......@@ -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:
......@@ -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:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment