From 1fea5d9ea793ff78625f7f506ae503fb37a59b41 Mon Sep 17 00:00:00 2001
From: Rajesh Battala <rajesh.battala@citrix.com>
Date: Wed, 7 May 2014 15:13:06 +0530
Subject: [PATCH] Fixed windows line ending issues

Conflicts:
	plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
	plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
---
 .../ServerResource/HypervResource/HypervResourceController.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index 67c367df6f9..b6f9a019445 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1172,7 +1172,7 @@ namespace HypervResource
                                 string defaultDataPath = wmiCallsV2.GetDefaultDataRoot();
 
                                 string secondaryPath = Utils.NormalizePath(Path.Combine(share.UncPath, "systemvm"));
-                                string[] choices = choices = Directory.GetFiles(secondaryPath, "systemvm*.iso");
+                                string[] choices = Directory.GetFiles(secondaryPath, "systemvm*.iso");
                                 if (choices.Length != 1)
                                 {
                                     String errMsg = "Couldn't locate the systemvm iso on " + secondaryPath;