Skip to content

Commit 43b3e98

Browse files
committed
removed lines added from a git action
1 parent 610aedf commit 43b3e98

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,13 @@
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-
<<<<<<< 5a3f20949198c648832d7ae2bed4ba88898a4a3d
46-
=======
4745
using JobStream = Microsoft.Azure.Commands.Automation.Model.JobStream;
4846
using Credential = Microsoft.Azure.Commands.Automation.Model.CredentialInfo;
4947
using JobSchedule = Microsoft.Azure.Commands.Automation.Model.JobSchedule;
5048
using Certificate = Microsoft.Azure.Commands.Automation.Model.CertificateInfo;
5149
using Connection = Microsoft.Azure.Commands.Automation.Model.Connection;
5250
using HybridRunbookWorkerGroup = Microsoft.Azure.Commands.Automation.Model.HybridRunbookWorkerGroup;
53-
>>>>>>> New cmdlet Get-AzureRMAutomationHybridRunbookWorkerGroup
51+
5452

5553
namespace Microsoft.Azure.Commands.Automation.Common
5654
{

0 commit comments

Comments
 (0)