From 6942b3cb6ba37f0ea5b8b93af1514cd0793a5c1b Mon Sep 17 00:00:00 2001
From: Jonathan Preddy <jpreddy@vistaprint.com>
Date: Tue, 22 Jul 2014 11:47:02 -0400
Subject: [PATCH] Fixing conflict erros in DateFilter

---
 TimberWinR/Configuration.cs      |  6 +++---
 TimberWinR/Filters/DateFilter.cs | 19 +++++--------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/TimberWinR/Configuration.cs b/TimberWinR/Configuration.cs
index e1bbaaf..5059903 100644
--- a/TimberWinR/Configuration.cs
+++ b/TimberWinR/Configuration.cs
@@ -477,7 +477,7 @@ namespace TimberWinR
                 switch (e.Name.ToString())
                 {
                     case "Grok":
-                        TimberWinR.Filters.GrokFilter.Params_Grok args = parseParams_Grok(e.Elements());
+                        TimberWinR.Filters.GrokFilter.Params_GrokFilter args = parseParams_GrokFilter(e.Elements());
                         GrokFilter grok = new GrokFilter(args);
                         _filters.Add(grok);
                         break;
@@ -868,9 +868,9 @@ namespace TimberWinR
             return p.Build();
         }
 
-        static TimberWinR.Filters.GrokFilter.Params_Grok parseParams_Grok(IEnumerable<XElement> elements)
+        static TimberWinR.Filters.GrokFilter.Params_GrokFilter parseParams_GrokFilter(IEnumerable<XElement> elements)
         {
-            TimberWinR.Filters.GrokFilter.Params_Grok.Builder p = new TimberWinR.Filters.GrokFilter.Params_Grok.Builder();
+            TimberWinR.Filters.GrokFilter.Params_GrokFilter.Builder p = new TimberWinR.Filters.GrokFilter.Params_GrokFilter.Builder();
 
             foreach (XElement e in elements)
             {
diff --git a/TimberWinR/Filters/DateFilter.cs b/TimberWinR/Filters/DateFilter.cs
index 617b5df..6f7d978 100644
--- a/TimberWinR/Filters/DateFilter.cs
+++ b/TimberWinR/Filters/DateFilter.cs
@@ -15,13 +15,12 @@ namespace TimberWinR.Filters
         public bool ConvertToUTC { get; private set; }
         public List<string> Patterns { get; private set; }
 
-<<<<<<< HEAD
         public DateFilter(Params_DateFilter args)
         {
             Field = args.Field;
             Target = args.Target;
             ConvertToUTC = args.ConvertToUTC;
-            Pattern = args.Pattern;
+            Patterns = args.Patterns;
         }
 
         public override string ToString()
@@ -39,14 +38,6 @@ namespace TimberWinR.Filters
             return sb.ToString();
         }
 
-        public override void Apply(Newtonsoft.Json.Linq.JObject json)
-=======
-        public DateFilter()
->>>>>>> ec8c41eb8339a04a975b5813cfedc74a9b787e56
-        {
-            Patterns = new List<string>();
-        }
-
         public override void Apply(JObject json)
         {
             JToken token = null;
@@ -92,14 +83,14 @@ namespace TimberWinR.Filters
             public string Field { get; private set; }
             public string Target { get; private set; }
             public bool ConvertToUTC { get; private set; }
-            public List<string> Pattern { get; private set; }
+            public List<string> Patterns { get; private set; }
 
             public class Builder
             {
                 private string field;
                 private string target;
                 private bool convertToUTC = false;
-                private List<string> pattern;
+                private List<string> patterns;
 
                 public Builder WithField(string value)
                 {
@@ -121,7 +112,7 @@ namespace TimberWinR.Filters
 
                 public Builder WithPattern(string value)
                 {
-                    pattern.Add(value);
+                    patterns.Add(value);
                     return this;
                 }
 
@@ -132,7 +123,7 @@ namespace TimberWinR.Filters
                         Field = field,
                         Target = target,
                         ConvertToUTC = convertToUTC,
-                        Pattern = pattern
+                        Patterns = patterns
                     };
                 }