From 9c6d08e7623f047e408a077eb021941692a0fde6 Mon Sep 17 00:00:00 2001 From: Manuel <2084639+tennox@users.noreply.github.com> Date: Mon, 19 Sep 2022 13:12:03 +0200 Subject: [PATCH] Remove Merge conflict remainder in Readme.md (#83) * Remove Merge conflict remainder in Readme.md Co-authored-by: Matthias Nannt --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index cb83b362ee..098502bd99 100644 --- a/README.md +++ b/README.md @@ -74,11 +74,7 @@ yarn install docker run --name snoopformsDB -p 5432:5432 -e POSTGRES_USER=snoopforms -e POSTGRES_PASSWORD=password -e POSTGRES_DB=snoopforms -d postgres ``` -<<<<<<< HEAD 1. Create a `.env` file based on `.env.example` and change it according to your setup. Make sure the `DATABASE_URL` variable is set correctly according to your local database. -======= -4. Create a `.env` file based on `.env.example` and change it according to your setup. Make sure the `DATABASE_URL` variable is set correctly according to your local database. For the signup process, an email server with valid SMTP data is necessary. ->>>>>>> 61dc008 (building webhook) ``` cp .env.example .env