diff options
| author | Chocobozzz <me@florianbigard.com> | 2023-06-29 13:52:24 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2023-06-29 13:52:24 +0200 |
| commit | a2871364278143fdda180b595e6e74851f5242bf (patch) | |
| tree | ed17fa454f833457e6156aa9601f971386466f9b | |
| parent | 6bd160a68dac55f61b28c7631f9985320daf7755 (diff) | |
| download | PeerTube-a2871364278143fdda180b595e6e74851f5242bf.tar.gz PeerTube-a2871364278143fdda180b595e6e74851f5242bf.tar.zst PeerTube-a2871364278143fdda180b595e6e74851f5242bf.zip | |
Fix migration conflict
| -rw-r--r-- | server/initializers/constants.ts | 2 | ||||
| -rw-r--r-- | server/initializers/migrations/0790-thumbnail-disk.ts (renamed from server/initializers/migrations/0785-thumbnail-disk.ts) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index ced18eef0..d87aa6f54 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
| @@ -27,7 +27,7 @@ import { CONFIG, registerConfigChangedHandler } from './config' | |||
| 27 | 27 | ||
| 28 | // --------------------------------------------------------------------------- | 28 | // --------------------------------------------------------------------------- |
| 29 | 29 | ||
| 30 | const LAST_MIGRATION_VERSION = 785 | 30 | const LAST_MIGRATION_VERSION = 790 |
| 31 | 31 | ||
| 32 | // --------------------------------------------------------------------------- | 32 | // --------------------------------------------------------------------------- |
| 33 | 33 | ||
diff --git a/server/initializers/migrations/0785-thumbnail-disk.ts b/server/initializers/migrations/0790-thumbnail-disk.ts index 0824c042e..0824c042e 100644 --- a/server/initializers/migrations/0785-thumbnail-disk.ts +++ b/server/initializers/migrations/0790-thumbnail-disk.ts | |||