# Conflicts: # dvadmin-backend/apps/vadmin/system/urls.py # dvadmin-backend/apps/vadmin/system/views.py |
||
|---|---|---|
| .. | ||
| application | ||
| apps/vadmin | ||
| conf | ||
| static/rest_framework | ||
| utils | ||
| .gitignore | ||
| docker_celery.sh | ||
| docker_start.sh | ||
| manage.py | ||
| requirements.txt | ||
# Conflicts: # dvadmin-backend/apps/vadmin/system/urls.py # dvadmin-backend/apps/vadmin/system/views.py |
||
|---|---|---|
| .. | ||
| application | ||
| apps/vadmin | ||
| conf | ||
| static/rest_framework | ||
| utils | ||
| .gitignore | ||
| docker_celery.sh | ||
| docker_start.sh | ||
| manage.py | ||
| requirements.txt | ||