Resolving merge conflicts

pnp · May 23, 2023 · 23bf501 · 23bf501
1 parent b703746
commit 23bf501
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/Commands/Admin/SetTenant.cs b/src/Commands/Admin/SetTenant.cs
@@ -349,13 +349,7 @@ public class SetTenant : PnPAdminCmdlet
         public bool? ShowPeoplePickerGroupSuggestionsForIB { get; set; }
 
         [Parameter(Mandatory = false)]
-        public int? OneDriveRequestFilesLinkExpirationInDays { get; set; }
-
-        [Parameter(Mandatory = false)]
-        public string ArchiveRedirectUrl { get; set; }
-
-        [Parameter(Mandatory = false)]
-        public bool? BlockSendLabelMismatchEmail { get; set; }     
+        public int? OneDriveRequestFilesLinkExpirationInDays { get; set; }  
 
         [Parameter(Mandatory = false)]
         public bool? BlockDownloadFileTypePolicy { get; set; }