gistfile1.diff

diff --cc rebelmouse/settings.py
index f5245ec,fef6f58..0000000
--- a/rebelmouse/settings.py
+++ b/rebelmouse/settings.py
@@@ -401,8 -396,7 +401,12 @@@ REDIS = 
      #    'master_host': 'redis-prod-master:6379',
      #    'slave_host': 'redis-prod-slave:6379',
      #},
++<<<<<<< HEAD
 +
 +    'river_notifications': {
++=======
+     'logged_users_active': {
++>>>>>>> dev
          'db': 44,
          'master_host': 'redis-prod-master:6379',
          'slave_host': 'redis-prod-slave:6379',
@@@ -532,8 -526,8 +536,13 @@@ MONGO = 
          'replica_name': 'rmnotifications',
          'replica_host': 'mongo-notifications-prod-master:27017,mongo-notifications-prod-slave:27017',
      },
++<<<<<<< HEAD
 +    'river': {
 +        'db': 'river',
++=======
+     'posts_history': {
+         'db': 'posts_history',
++>>>>>>> dev
          'user': '',
          'password': '',
          'host': 'mongo-notifications-prod-master:27017',