readme

marswe · Nov 12, 2015 · 06db7fd · 06db7fd
1 parent 40412ab
commit 06db7fd
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
 # Windows-Container-Documentation-Private
 Documents for Windows Server and Hyper-V Containers...
-=======
-# Hyper-V-PowerShell
-Scripts that primarily use the Hyper-V PowerShell interfaces driving virtual machines
->>>>>>> 3c1f406004a01634a1001baa5090c1fcb6b49623