From 0728735201f813b26ce828893c4cc95e185eb672 Mon Sep 17 00:00:00 2001 From: Andrew Horth Date: Thu, 23 Nov 2023 13:30:32 +0000 Subject: [PATCH] Fixed file corruption caused by rebase --- tools/coretools/CrmSvcUtil.exe.config | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/tools/coretools/CrmSvcUtil.exe.config b/tools/coretools/CrmSvcUtil.exe.config index 7d9c19bc9..28ccbc077 100644 --- a/tools/coretools/CrmSvcUtil.exe.config +++ b/tools/coretools/CrmSvcUtil.exe.config @@ -19,19 +19,8 @@ -<<<<<<< HEAD - -<<<<<<< HEAD - -||||||| parent of 89cf2325 (Add AllowIdSignInWithProhibitions member to v3 teacher response) - -======= - ->>>>>>> 89cf2325 (Add AllowIdSignInWithProhibitions member to v3 teacher response) -======= - ->>>>>>> cedd8028 (Added UI tests) +