solve merge conficts in readme
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -9,6 +9,9 @@
|
|||||||
# environment variables
|
# environment variables
|
||||||
.env
|
.env
|
||||||
|
|
||||||
|
# virtual env
|
||||||
|
venv/
|
||||||
|
|
||||||
# Migrations
|
# Migrations
|
||||||
**/migrations
|
**/migrations
|
||||||
|
|
||||||
|
|||||||
@@ -10,20 +10,20 @@ This README aims to document functionality of backend as well as required steps
|
|||||||
## First Steps
|
## First Steps
|
||||||
|
|
||||||
- Clone repository:
|
- 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
|
- Create file `.env` from `example.env` and populate fields correctly
|
||||||
|
|
||||||
From inside the project's folder:
|
From inside the project's folder:
|
||||||
|
|
||||||
- Make migrations:
|
- Make migrations:
|
||||||
|
|
||||||
```
|
```
|
||||||
python manage.py makemigrations core geo companies products history stats
|
python manage.py makemigrations core geo companies products history stats
|
||||||
python migrate
|
python migrate
|
||||||
```
|
```
|
||||||
- Start server in development mode: `python manage.py runserver`
|
|
||||||
|
|
||||||
|
- Start server in development mode: `python manage.py runserver`
|
||||||
|
|
||||||
## Location data
|
## Location data
|
||||||
|
|
||||||
To load initial location data use: `python manage.py addgeo`
|
To load initial location data use: `python manage.py addgeo`
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user