From 74bd227da9276894968f2b02584afe83f78c0fc5 Mon Sep 17 00:00:00 2001 From: Rupika Date: Thu, 10 Jan 2019 22:22:15 -0800 Subject: [PATCH] Resolved merge conflict --- back/reimbursinator/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/reimbursinator/settings.py b/back/reimbursinator/settings.py index e5e352a..56718b2 100644 --- a/back/reimbursinator/settings.py +++ b/back/reimbursinator/settings.py @@ -25,7 +25,7 @@ SECRET_KEY = 'w*d2$rg#i88&6^9u2)jl0!4_)=_e1)0fxreofqzb(qxaw$3+$d' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ['192.168.1.164', 'localhost', '192.168.99.100'] +ALLOWED_HOSTS = ['localhost','192.168.99.100'] # Application definition