Merge remote-tracking branch 'origin/master'

Conflicts: TimberWinR/Configuration.cs
2014-07-18 07:33:21 -04:00
parent eb7fa8bffe 16df79eb33
commit 2d0001c190
1 changed files with 4 additions and 1 deletions
--- a/TimberWinR/Configuration.cs
+++ b/TimberWinR/Configuration.cs
@@ -286,6 +286,9 @@ namespace TimberWinR
                IISW3CLog iisw3c = new IISW3CLog(name, location, fields, args);
                _iisw3clogs.Add(iisw3c);
            }
+
+
+            Console.WriteLine("end");
        }

        static List<FieldDefinition> parseFields_Event(IEnumerable<XElement> xml_fields)
@@ -1370,4 +1373,4 @@ namespace TimberWinR
        }

    }
-}
+}