From f313f7ca248762fccb35068b2115e8e333734048 Mon Sep 17 00:00:00 2001
From: Patrick McDonagh <patrickjmcd@gmail.com>
Date: Tue, 2 May 2017 10:17:28 -0500
Subject: [PATCH] Ignores build files and updated mongo URI

---
 .gitignore     | 6 ++++++
 production.ini | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c4dc76a..807b93c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,8 @@
+<<<<<<< Updated upstream
 env/*
 pocwww.egg*
+=======
+
+env/*
+pocwww.egg-info/*
+>>>>>>> Stashed changes
diff --git a/production.ini b/production.ini
index 5b98c2f..5a3e70f 100644
--- a/production.ini
+++ b/production.ini
@@ -10,7 +10,7 @@ pyramid.debug_authorization = false
 pyramid.debug_notfound = false
 pyramid.debug_routematch = false
 pyramid.default_locale_name = en
-mongo_uri = mongodb://localhost:27017/poc
+mongo_uri = mongodb://poc_www:HenryPump1903@localhost:27017/poc
 
 
 #---------- Pipeline Configuration ----------