Skip to content

Commit 94819e3

Browse files
committed
fixing merge conflicts
1 parent 43b3e98 commit 94819e3

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

src/ResourceManager/Automation/Commands.Automation/Common/AutomationClient.cs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@
4242
using Runbook = Microsoft.Azure.Commands.Automation.Model.Runbook;
4343
using Schedule = Microsoft.Azure.Commands.Automation.Model.Schedule;
4444
using Variable = Microsoft.Azure.Commands.Automation.Model.Variable;
45-
using JobStream = Microsoft.Azure.Commands.Automation.Model.JobStream;
46-
using Credential = Microsoft.Azure.Commands.Automation.Model.CredentialInfo;
47-
using JobSchedule = Microsoft.Azure.Commands.Automation.Model.JobSchedule;
48-
using Certificate = Microsoft.Azure.Commands.Automation.Model.CertificateInfo;
49-
using Connection = Microsoft.Azure.Commands.Automation.Model.Connection;
5045
using HybridRunbookWorkerGroup = Microsoft.Azure.Commands.Automation.Model.HybridRunbookWorkerGroup;
5146

5247

@@ -1644,20 +1639,20 @@ private Azure.Management.Automation.Models.Runbook TryGetRunbookModel(string res
16441639
}
16451640
return runbook;
16461641
}
1647-
<<<<<<< 5a3f20949198c648832d7ae2bed4ba88898a4a3d
16481642

1649-
private Azure.Management.Automation.Models.Certificate TryGetCertificateModel(string resourceGroupName, string automationAccountName,
1650-
=======
1643+
1644+
1645+
16511646
private Azure.Management.Automation.Models.HybridRunbookWorkerGroup TryGetHybridRunbookWorkerModel(string resourceGroupName, string automationAccountName, string HybridRunbookWorkerGroupName)
16521647
{
16531648
Azure.Management.Automation.Models.HybridRunbookWorkerGroup hybridRunbookWorkerGroup = null;
16541649
try
16551650
{
16561651
hybridRunbookWorkerGroup = this.automationManagementClient.HybridRunbookWorkerGroups.Get(resourceGroupName, automationAccountName, HybridRunbookWorkerGroupName).HybridRunbookWorkerGroup;
16571652
}
1658-
catch(CloudException e)
1653+
catch (CloudException e)
16591654
{
1660-
if(e.Response.StatusCode == HttpStatusCode.NotFound)
1655+
if (e.Response.StatusCode == HttpStatusCode.NotFound)
16611656
{
16621657
hybridRunbookWorkerGroup = null;
16631658
}
@@ -1669,7 +1664,6 @@ private Azure.Management.Automation.Models.HybridRunbookWorkerGroup TryGetHybrid
16691664
return hybridRunbookWorkerGroup;
16701665
}
16711666
private Azure.Management.Automation.Models.Certificate TryGetCertificateModel(string resourceGroupName, string automationAccountName,
1672-
>>>>>>> New cmdlet Get-AzureRMAutomationHybridRunbookWorkerGroup
16731667
string certificateName)
16741668
{
16751669
Azure.Management.Automation.Models.Certificate certificate = null;

0 commit comments

Comments
 (0)