From 44bf1a0b196d721778d241bef22c68ff4fa7e544 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 4 Feb 2020 12:27:50 +0100
Subject: [PATCH] TMSS-139: rebased
---
SAS/TMSS/src/tmss/settings.py | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/SAS/TMSS/src/tmss/settings.py b/SAS/TMSS/src/tmss/settings.py
index 39058b823b1..af27ed44e3b 100644
--- a/SAS/TMSS/src/tmss/settings.py
+++ b/SAS/TMSS/src/tmss/settings.py
@@ -14,7 +14,6 @@ import os
import logging
from lofar.common import dbcredentials, isDevelopmentEnvironment
-<<<<<<< HEAD
logger = logging.getLogger(__name__)
LOGGING = {
@@ -67,17 +66,6 @@ LOGGING = {
},
}
}
-=======
-# logger
-logger = logging.getLogger(__name__)
-
-# fix/setup django_auth_ldap logging
-logging.getLogger('django_auth_ldap').addHandler(logging.StreamHandler())
-logging.getLogger('django_auth_ldap').setLevel(logging.INFO)
-
-# from pprint import pprint
-# pprint(dict(os.environ))
->>>>>>> 5625d012ecffb971e8f8808fde16f35bfba34714
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -140,10 +128,6 @@ TEMPLATES = [
]
WSGI_APPLICATION = 'lofar.sas.tmss.tmss.wsgi.application'
-<<<<<<< HEAD
-=======
-
->>>>>>> 5625d012ecffb971e8f8808fde16f35bfba34714
# Database
# https://docs.djangoproject.com/en/2.0/ref/settings/#databases
--
GitLab