solve merge conficts in readme

This commit is contained in:
Diego Calvo
2021-01-25 14:10:57 +01:00
parent c3c9f54c54
commit afe48992c6
2 changed files with 7 additions and 4 deletions

View File

@@ -10,20 +10,20 @@ This README aims to document functionality of backend as well as required steps
## First Steps
- Clone repository:
`git clone git@bitbucket.org:enreda/back-latienda.git`
`git clone git@bitbucket.org:enreda/back-latienda.git`
- Create file `.env` from `example.env` and populate fields correctly
From inside the project's folder:
- Make migrations:
```
python manage.py makemigrations core geo companies products history stats
python migrate
```
- Start server in development mode: `python manage.py runserver`
- Start server in development mode: `python manage.py runserver`
## Location data
To load initial location data use: `python manage.py addgeo`