Resolved conflicts with the latest version

This commit is contained in:
aiden
2021-03-23 17:49:15 +11:00
committed by Aydin Salimov
parent e7db566eee
commit 844bd3d5d9
7 changed files with 11 additions and 11 deletions

View File

@ -75,7 +75,7 @@ Your folder structure should look like this:
We'll need to do step 1 of the [Usage](#Usage) section now to make this happen.
```
cp env-example .env
cp .env.example .env
```
At the top, change the `APP_CODE_PATH_HOST` variable to your project path.
@ -155,10 +155,10 @@ We recommend using a Docker version which is newer than 1.13.
<br>
1 - Enter the laradock folder and copy `env-example` to `.env`
1 - Enter the laradock folder and copy `.env.example` to `.env`
```shell
cp env-example .env
cp .env.example .env
```
You can edit the `.env` file to choose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are being used.