# Conflicts: # apps/establishment/admin.py # apps/establishment/models.py # apps/establishment/serializers.py |
||
|---|---|---|
| .. | ||
| migrations | ||
| urls | ||
| __init__.py | ||
| admin.py | ||
| apps.py | ||
| filters.py | ||
| models.py | ||
| serializers.py | ||
| tasks.py | ||
| tests.py | ||
| views.py | ||
# Conflicts: # apps/establishment/admin.py # apps/establishment/models.py # apps/establishment/serializers.py |
||
|---|---|---|
| .. | ||
| migrations | ||
| urls | ||
| __init__.py | ||
| admin.py | ||
| apps.py | ||
| filters.py | ||
| models.py | ||
| serializers.py | ||
| tasks.py | ||
| tests.py | ||
| views.py | ||