Fix travis conflicts.
Showing
- .travis.yml 2 additions, 1 deletion.travis.yml
- internal/sqladapter/testing/adapter.go.tpl 49 additions, 14 deletionsinternal/sqladapter/testing/adapter.go.tpl
- lib/sqlbuilder/builder.go 50 additions, 13 deletionslib/sqlbuilder/builder.go
- lib/sqlbuilder/builder_test.go 77 additions, 13 deletionslib/sqlbuilder/builder_test.go
- lib/sqlbuilder/insert.go 5 additions, 1 deletionlib/sqlbuilder/insert.go
- lib/sqlbuilder/interfaces.go 3 additions, 0 deletionslib/sqlbuilder/interfaces.go
- lib/sqlbuilder/update.go 1 addition, 1 deletionlib/sqlbuilder/update.go
- mysql/collection.go 1 addition, 1 deletionmysql/collection.go
- postgresql/collection.go 1 addition, 1 deletionpostgresql/collection.go
- ql/collection.go 1 addition, 1 deletionql/collection.go
- sqlite/collection.go 1 addition, 1 deletionsqlite/collection.go
Loading
Please register or sign in to comment