# Conflicts: # apps/transfer/management/commands/transfer.py # apps/transfer/serializers/location.py |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| amazon_s3.py | ||
| base.py | ||
| development.py | ||
| local.py | ||
| production.py | ||
| stage.py | ||
# Conflicts: # apps/transfer/management/commands/transfer.py # apps/transfer/serializers/location.py |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| amazon_s3.py | ||
| base.py | ||
| development.py | ||
| local.py | ||
| production.py | ||
| stage.py | ||