resolve conflict

blueww · blueww · commit 6b0aaac20eae · 2016-04-27T10:33:58.000+08:00
diff --git a/src/Common/Commands.Common.Storage/Adapters/ARM.Storage.5/ARMStorageService.cs b/src/Common/Commands.Common.Storage/Adapters/ARM.Storage.5/ARMStorageService.cs
@@ -83,7 +83,6 @@ public static string ParseResourceGroupFromId(string resourceId)
             }
             return null;
         }
-
         public static Uri GetUri(string uriString)
         {
             return uriString == null ? null : new Uri(uriString);

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ public static string ParseResourceGroupFromId(string resourceId)`
`83`	`83`	`}`
`84`	`84`	`return null;`
`85`	`85`	`}`
`86`		`-`
`87`	`86`	`public static Uri GetUri(string uriString)`
`88`	`87`	`{`
`89`	`88`	`return uriString == null ? null : new Uri(uriString);`