Resolved conflicts with the latest version

2021-03-23 17:49:15 +11:00
parent e7db566eee
commit 844bd3d5d9
7 changed files with 11 additions and 11 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,6 +1,6 @@
 {
    "files.associations": {
-        "env-example": "dotenv",
+        ".env.example": "dotenv",
        "Dockerfile-*": "dockerfile"
    }
 }