Update azurerestutility.ts

dikhakha · web-flow · commit ed4b1573adb9 · 2016-12-22T17:47:54.000+05:30
diff --git a/Tasks/Common/azurerest-common/azurerestutility.ts b/Tasks/Common/azurerest-common/azurerestutility.ts
@@ -308,7 +308,6 @@ export async function updateWebAppAppSettings(endpoint, webAppName: string, reso
     return deferred.promise;
 }
 
-<<<<<<< HEAD
 async function getOperationStatus(SPN, webAppName: string, resourceGroupName: string, slotName: string, url: string) {
     var deferred = Q.defer();
     var accessToken = await getAuthorizationToken(SPN);
@@ -479,4 +478,4 @@ export async function restartAppService(endpoint, resourceGroupName: string, web
         }
     });
     return deferred.promise;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,6 @@ export async function updateWebAppAppSettings(endpoint, webAppName: string, reso`
`308`	`308`	`return deferred.promise;`
`309`	`309`	`}`
`310`	`310`
`311`		`-<<<<<<< HEAD`
`312`	`311`	`async function getOperationStatus(SPN, webAppName: string, resourceGroupName: string, slotName: string, url: string) {`
`313`	`312`	`var deferred = Q.defer();`
`314`	`313`	`var accessToken = await getAuthorizationToken(SPN);`
`@@ -479,4 +478,4 @@ export async function restartAppService(endpoint, resourceGroupName: string, web`
`479`	`478`	`}`
`480`	`479`	`});`
`481`	`480`	`return deferred.promise;`
`482`		`-}`
	`481`	`+}`