Fix merge issues

Browse Source

...

This commit is contained in:

Jeff Mitchell committed 2021-10-21 13:47:46 -04:00

1 parent 0fd906d964

commit 1cf94d0e3e

9 files changed

+3 -1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/db/schema/migrations/oss/postgres/17/01_domain_types.up.sql → internal/db/schema/migrations/oss/postgres/18/01_domain_types.up.sql

File renamed without changes.

internal/db/schema/migrations/oss/postgres/17/02_plugin.up.sql → internal/db/schema/migrations/oss/postgres/18/02_plugin.up.sql

File renamed without changes.

internal/db/schema/migrations/oss/postgres/17/03_hostplugin.up.sql → internal/db/schema/migrations/oss/postgres/18/03_hostplugin.up.sql

File renamed without changes.

internal/db/schema/migrations/oss/postgres/17/04_host.up.sql → internal/db/schema/migrations/oss/postgres/18/04_host.up.sql

File renamed without changes.

internal/db/schema/migrations/oss/postgres/17/05_plugin_host.up.sql → internal/db/schema/migrations/oss/postgres/18/05_plugin_host.up.sql

File renamed without changes.

internal/db/schema/migrations/oss/postgres/17/06_preferred_endpoints.up.sql → internal/db/schema/migrations/oss/postgres/18/06_preferred_endpoints.up.sql

File renamed without changes.

internal/db/schema/migrations/oss/postgres/17/07_wh_session_dimensions.up.sql → internal/db/schema/migrations/oss/postgres/18/07_wh_session_dimensions.up.sql

File renamed without changes.