search

SAP / cloud-security-services-integration-library

Integration libraries and samples for authenticating users and clients bound to XSUAA authentication and authorization service or Identity authentication service.
Apache License 2.0
151 stars 136 forks source link

Last merge resulted in merge artefacts in cf-logcollector.ps1 #332

Closed DerGuteWolf closed 4 years ago

DerGuteWolf commented 4 years ago

Last merge resulted in merge artefacts in cf-logcollector.ps1, ie https://github.com/SAP/cloud-security-xsuaa-integration/blob/master/troubleshooting/logcollector/cf-logcollector.ps1, eg

<<<<<<< HEAD
    [Parameter(Mandatory = $false, HelpMessage = "Enter path to output zip file.", Position = 2)]
    [String]$Logs = "$HOME\logcollection.zip"
=======
    [Parameter(Mandatory=$false, HelpMessage="Enter path to output zip file.", Position=2)]
    [String]$Logs="$HOME\logcollection.zip",
    [Parameter(Mandatory=$false, HelpMessage="Restore log-levels only?", Position=2)]
    [Switch]$RestoreLogLevelsOnly=$false
>>>>>>> ias
Essenpreis commented 4 years ago

Hi @DerGuteWolf, fixed: Please try again.