Skip to content

Commit 81e22c3

Browse files
committed
Fix error introduced when merging Django 1.7+ migrations
1 parent 40beb2b commit 81e22c3

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

database_files/migrations/0001_initial.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
from django.db import models, migrations
55
import django.utils.timezone
66

7-
from south.db import db
8-
from south.v2 import SchemaMigration
97

108
class Migration(migrations.Migration):
119

@@ -20,11 +18,11 @@ class Migration(migrations.Migration):
2018
('name', models.CharField(unique=True, max_length=255, db_index=True)),
2119
('size', models.PositiveIntegerField(db_index=True)),
2220
('content', models.BinaryField()),
23-
('created_datetime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Created datetime', db_index=True)),
24-
('_content_hash', models.CharField(db_index=True, max_length=128, null=True, db_column='content_hash', blank=True)),
21+
('created_datetime', models.DateTimeField(default=django.utils.timezone.now, verbose_name=b'Created datetime', db_index=True)),
22+
('_content_hash', models.CharField(db_index=True, max_length=128, null=True, db_column=b'content_hash', blank=True)),
2523
],
2624
options={
2725
'db_table': 'database_files_file',
2826
},
2927
),
30-
]
28+
]

0 commit comments

Comments
 (0)