From de89a87aa5549aaa31cb301c1a98fff6336c7aeb Mon Sep 17 00:00:00 2001
From: Norm MacLennan <norm.maclennan@gmail.com>
Date: Wed, 7 May 2014 16:07:48 -0700
Subject: [PATCH] merge conflicts and out of date test code

---
 src/NOCQ.Application/Program.cs     | 4 ----
 src/NOCQ/Plugins/Email/ImapInput.cs | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/NOCQ.Application/Program.cs b/src/NOCQ.Application/Program.cs
index f447897..8e7a989 100644
--- a/src/NOCQ.Application/Program.cs
+++ b/src/NOCQ.Application/Program.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Dynamic;
-<<<<<<< HEAD
 using NOCQ.Settings;
-=======
-using System.Linq;
->>>>>>> e5ed166572b47afde75d47f888768ae5b8d528f2
 using NOCQ.Plugins.Email;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/NOCQ/Plugins/Email/ImapInput.cs b/src/NOCQ/Plugins/Email/ImapInput.cs
index bc4a43d..a9b0c22 100644
--- a/src/NOCQ/Plugins/Email/ImapInput.cs
+++ b/src/NOCQ/Plugins/Email/ImapInput.cs
@@ -123,7 +123,7 @@ namespace NOCQ.Plugins.Email
 			var alerts = getAlerts ();
 
 			foreach (var alert in alerts) {
-				RedisDataase.SaveAlert (alert, "output");
+				//RedisDatabase.SaveAlert (alert);
 			}
 		}