mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-09 16:18:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

merge clashing commits

Browse Source
This commit is contained in:
smilerz
2022-02-07 18:11:38 -06:00
parent 286c6344ec
commit 93b7e5790d
3 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cookbook/migrations/0170_auto_20220207_1848.py
View File

@@ -1,9 +1,10 @@
# Generated by Django 3.2.11 on 2022-02-07 17:48
import cookbook.models
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import cookbook.models
class Migration(migrations.Migration):

18
cookbook/migrations/0172_food_child_inherit_fields.py
View File

@@ -1,18 +0,0 @@
# Generated by Django 3.2.11 on 2022-02-04 17:11
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('cookbook', '0171_auto_20220202_1340'),
]
operations = [
migrations.AddField(
model_name='food',
name='child_inherit_fields',
field=models.ManyToManyField(blank=True, related_name='child_inherit', to='cookbook.FoodInheritField'),
),
]