mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-01-11 09:45:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge conflict fix

Browse source
This commit is contained in:
Giebisch 2023-01-11 16:23:20 +01:00
parent b22d060d93
commit b9576ccd31
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bookwyrm/migrations/0174_merge_20230111_1523.py Normal file
View file

@ -0,0 +1,13 @@
# Generated by Django 3.2.16 on 2023-01-11 15:23
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("bookwyrm", "0173_auto_20221228_1436"),
("bookwyrm", "0173_merge_20230102_1444"),
]
operations = []