Clean up uneccessary line in README.MD

dsccommunity · Feb 2, 2019 · eacc381 · eacc381
1 parent 7079313
commit eacc381
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Tests/Unit/MSFT_xGroupResource.Tests.ps1 b/Tests/Unit/MSFT_xGroupResource.Tests.ps1
@@ -929,11 +929,7 @@ try
                         return $memberPrincipals
                     }
 
-<<<<<<< HEAD
-                    Mock -CommandName 'Clear-GroupMembers' -MockWith { }
-=======
                     Mock -CommandName 'Clear-GroupMember' -MockWith { }
->>>>>>> Renamed Clear-GroupMembers helper function to Clear-GroupMember to remove violation of PowerShell best practice.
                     Mock -CommandName 'Add-GroupMember' -MockWith { }
                     Mock -CommandName 'Remove-GroupMember' -MockWith { }
                     Mock -CommandName 'Remove-Group' -MockWith { }