Skip to content

Commit

Permalink
fix migrations conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
milovate committed Jan 23, 2025
1 parent 41b7b82 commit 42bfd2c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
14 changes: 0 additions & 14 deletions workspaces/migrations/0009_merge_20250123_1941.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# Generated by Django 5.1.3 on 2025-01-19 19:52
# Generated by Django 5.1.3 on 2025-01-23 16:06

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('workspaces', '0007_workspaceinvite_clicks'),
('workspaces', '0008_workspace_handle'),
]

operations = [
migrations.AddField(
model_name='workspace',
name='onedrive_access_token',
field=models.TextField(blank=True, default='', editable=False, help_text='Onedrive OAuth2 access token (mandatory)'),
field=models.TextField(blank=True, default='', help_text='Onedrive OAuth2 access token (mandatory)'),
),
migrations.AddField(
model_name='workspace',
name='onedrive_refresh_token',
field=models.TextField(blank=True, default='', editable=False, help_text='OneDrive OAuth2 refresh token'),
field=models.TextField(blank=True, default='', help_text='OneDrive OAuth2 refresh token'),
),
]

0 comments on commit 42bfd2c

Please sign in to comment.