From 552e397e5625b831631f0a7e64df30aff094cbe5 Mon Sep 17 00:00:00 2001 From: Sujit Prasad Date: Tue, 16 Feb 2016 23:35:00 +0530 Subject: [PATCH] Update .env --- .env | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.env b/.env index 6fd6260c3..2f19f896f 100644 --- a/.env +++ b/.env @@ -2,15 +2,9 @@ APP_ENV=local APP_DEBUG=true APP_KEY=SomeRandomString DB_HOST=localhost -<<<<<<< Updated upstream DB_DATABASE=faveo1.0.6 DB_USERNAME=root DB_PASSWORD= -======= -DB_DATABASE=faveo-github -DB_USERNAME=bhanu -DB_PASSWORD=bhanu ->>>>>>> Stashed changes CACHE_DRIVER=file SESSION_DRIVER=file QUEUE_DRIVER=sync