Skip to content

Commit 06932f4

Browse files
committed
Fixing merge conflict
1 parent 27999df commit 06932f4

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed
Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
"AssemblyFileName","ClassName","Target","Severity","ProblemId","Description","Remediation"
2-
<<<<<<< HEAD
3-
"Microsoft.Azure.Commands.Sql.dll","Microsoft.Azure.Commands.Sql.ImportExport.Cmdlet.NewAzureSqlDatabaseImport","New-AzureRmSqlDatabaseImport","0","2020","The cmdlet 'New-AzureRmSqlDatabaseImport' no longer supports the type 'Int32' for parameter 'DatabaseMaxSizeBytes'.","Change the type for parameter 'DatabaseMaxSizeBytes' back to 'Int32'."
4-
=======
5-
"Microsoft.Azure.Commands.Sql.dll","Microsoft.Azure.Commands.Sql.ImportExport.Cmdlet.NewAzureSqlDatabaseImport","New-AzureRmSqlDatabaseImport","0","2020","The cmdlet 'New-AzureRmSqlDatabaseImport' no longer supports the type 'Int32' for parameter 'DatabaseMaxSizeBytes'.","Change the type for parameter 'DatabaseMaxSizeBytes' back to 'Int32'."
6-
"Microsoft.Azure.Commands.Compute.dll","Microsoft.Azure.Commands.Compute.Extension.DSC.SetAzureVMDscExtensionCommand","Set-AzureRmVMDscExtension","0","2040","The validation set for parameter 'WmfVersion' for cmdlet '5.1PP' no longer contains the value 'Set-AzureRmVMDscExtension'","Add '5.1PP' back to the validation set for 'WmfVersion'"
7-
>>>>>>> 4c039976d91597eda67290469954bcaac84e3424
1+
AssemblyFileName,ClassName,Target,Severity,ProblemId,Description,Remediation
2+
Microsoft.Azure.Commands.Sql.dll,Microsoft.Azure.Commands.Sql.ImportExport.Cmdlet.NewAzureSqlDatabaseImport,New-AzureRmSqlDatabaseImport,0,2020,The cmdlet 'New-AzureRmSqlDatabaseImport' no longer supports the type 'Int32' for parameter 'DatabaseMaxSizeBytes'.,Change the type for parameter 'DatabaseMaxSizeBytes' back to 'Int32'.
3+
Microsoft.Azure.Commands.Compute.dll,Microsoft.Azure.Commands.Compute.Extension.DSC.SetAzureVMDscExtensionCommand,Set-AzureRmVMDscExtension,0,2040,The validation set for parameter 'WmfVersion' for cmdlet '5.1PP' no longer contains the value 'Set-AzureRmVMDscExtension',Add '5.1PP' back to the validation set for 'WmfVersion'

0 commit comments

Comments
 (0)