Removed merge message

russellseymour · Mar 10, 2014 · 649424b · 649424b
1 parent f8d45fe
commit 649424b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 # Logging
 
 One of the issues with PowerShell's built in 'Write-' commands is that it is not easy to capture the output from them and then parse that log.  So if, for example, there was the following code in a script: