hyperv.ps1 in kitchen-hyperv-0.1.1

- old
+ new

@@ -1,13 +1,10 @@
 
 $ProgressPreference = "SilentlyContinue"
 
-<<<<<<< HEAD:lib/kitchen/support/hyperv.ps1
-function new-differencingdisk
-=======
+
 function New-DifferencingDisk
->>>>>>> rubocop'd and some tests:support/hyperv.ps1
 {
 	[cmdletbinding()]
 	param ([string[]]$Path, [string]$ParentPath)
 	if (-not (test-path $Path))
     {
@@ -136,14 +133,11 @@
 	        Name = $vm.name
 	        Id = $vm.ID
 	        IpAddress = (Get-VmIP $vm)
 	      }
 	    }
-<<<<<<< HEAD:lib/kitchen/support/hyperv.ps1
-=======
 }
 
 function Get-DefaultVMSwitch
 {
-    Get-VMSwitch | Select -First 1 
->>>>>>> rubocop'd and some tests:support/hyperv.ps1
+    Get-VMSwitch | Select -First 1
 }
\ No newline at end of file