From fdeb0feed44bbe86bf85988fa80f1b2bb987da85 Mon Sep 17 00:00:00 2001
From: rsakeys <jakemartinfloyd@gmai.com>
Date: Sun, 9 Jun 2019 02:29:05 +0200
Subject: [PATCH] Merge branch 'master' of /home/ro/Desktop/Houdini-asyncio
 with conflicts.

---
 config.py.sample | 55 ------------------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 config.py.sample

diff --git a/config.py.sample b/config.py.sample
deleted file mode 100644
index d23935b..0000000
--- a/config.py.sample
+++ /dev/null
@@ -1,55 +0,0 @@
-from houdini import ConflictResolution
-from houdini import Language
-
-database = {
-    'Address': 'localhost',
-    'Username': 'postgres',
-    'Password': 'password',
-    'Name': 'houdini',
-}
-
-redis = {
-    'Address': '127.0.0.1',
-    'Port': 6379
-}
-
-commands = {
-    'Prefix': ['!', '?', '.'],
-    'StringDelimiters': ['"', "'"],
-    'ConflictMode': ConflictResolution.Silent
-}
-
-servers = {
-    'Login': {
-        'Address': '0.0.0.0',
-        'Port': 6112,
-        'World': False,
-        'Plugins': [
-            'Example'
-        ],
-        'Logging': {
-            'General': 'logs/login.log',
-            'Errors': 'logs/login-errors.log',
-            'Level': 'INFO'
-        },
-        'LoginFailureLimit': 5,
-        'LoginFailureTimer': 3600,
-        'KeyTTL': 3000
-    },
-    'Blizzard': {
-        'Id': '100',
-        'Address': '0.0.0.0',
-        'Port': 9875,
-        'Language': Language.En,
-        'World': True,
-        'Capacity': 200,
-        'CacheExpiry': 3600,
-        'Plugins': [
-        ],
-        'Logging': {
-            'General': 'logs/blizzard.log',
-            'Errors': 'logs/blizzard-errors.log',
-            'Level': 'INFO'
-        }
-    }
-}