From bb96e42454c1e07f0a540fd93b4aa78619e797f0 Mon Sep 17 00:00:00 2001 From: milovate Date: Thu, 23 Jan 2025 21:36:07 +0530 Subject: [PATCH] fix migrations conflict --- workspaces/migrations/0009_merge_20250123_1941.py | 14 -------------- ...09_workspace_onedrive_access_token_and_more.py} | 0 2 files changed, 14 deletions(-) delete mode 100644 workspaces/migrations/0009_merge_20250123_1941.py rename workspaces/migrations/{0008_workspace_onedrive_access_token_and_more.py => 0009_workspace_onedrive_access_token_and_more.py} (100%) diff --git a/workspaces/migrations/0009_merge_20250123_1941.py b/workspaces/migrations/0009_merge_20250123_1941.py deleted file mode 100644 index c9ebb2dca..000000000 --- a/workspaces/migrations/0009_merge_20250123_1941.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 5.1.3 on 2025-01-23 14:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('workspaces', '0008_workspace_handle'), - ('workspaces', '0008_workspace_onedrive_access_token_and_more'), - ] - - operations = [ - ] diff --git a/workspaces/migrations/0008_workspace_onedrive_access_token_and_more.py b/workspaces/migrations/0009_workspace_onedrive_access_token_and_more.py similarity index 100% rename from workspaces/migrations/0008_workspace_onedrive_access_token_and_more.py rename to workspaces/migrations/0009_workspace_onedrive_access_token_and_more.py