fixed merge anomaly error

This commit is contained in:
purplecabbage
2013-09-12 17:24:09 -07:00
parent 6eaa2efcd0
commit 6bd367c512
+5 -5
View File
@@ -325,11 +325,8 @@ namespace WPCordovaClassLib.Cordova.Commands
string temp = jsonHeaders.StartsWith("{") ? jsonHeaders.Substring(1) : jsonHeaders; string temp = jsonHeaders.StartsWith("{") ? jsonHeaders.Substring(1) : jsonHeaders;
temp = temp.EndsWith("}") ? temp.Substring(0, temp.Length - 1) : temp; temp = temp.EndsWith("}") ? temp.Substring(0, temp.Length - 1) : temp;
string[] strHeaders = temp.Split(','); string[] strHeaders = temp.Split(',');
for (int n = 0; n < strHeaders.Length; n++) for (int n = 0; n < strHeaders.Length; n++)
{
string[] split = strHeaders[n].Split(":".ToCharArray(), 2);
if (split.Length == 2)
{ {
string[] split = strHeaders[n].Split(':'); string[] split = strHeaders[n].Split(':');
if (split.Length == 2) if (split.Length == 2)
@@ -338,6 +335,8 @@ namespace WPCordovaClassLib.Cordova.Commands
split[1] = JSON.JsonHelper.Deserialize<string>(split[1]); split[1] = JSON.JsonHelper.Deserialize<string>(split[1]);
result[split[0]] = split[1]; result[split[0]] = split[1];
} }
} }
return result; return result;
} }
@@ -349,6 +348,7 @@ namespace WPCordovaClassLib.Cordova.Commands
} }
public void download(string options) public void download(string options)
{ {
TransferOptions downloadOptions = null; TransferOptions downloadOptions = null;