From 232838bf50b584c8191636d0576ed4f1e087bdd8 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Tue, 23 Aug 2022 16:10:24 -0500
Subject: [PATCH] Fix mockito 4.7.0 merge

Issue gh-11748
---
 dependencies/spring-security-dependencies.gradle | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle
index c46a345483..4357da26b8 100644
--- a/dependencies/spring-security-dependencies.gradle
+++ b/dependencies/spring-security-dependencies.gradle
@@ -57,13 +57,7 @@ dependencies {
 		api "org.hibernate:hibernate-entitymanager:5.6.10.Final"
 		api "org.hsqldb:hsqldb:2.6.1"
 		api "org.jasig.cas.client:cas-client-core:3.6.4"
-<<<<<<< HEAD
-		api "org.mockito:mockito-core:3.12.4"
-		api "org.mockito:mockito-inline:3.12.4"
-		api "org.mockito:mockito-junit-jupiter:3.12.4"
 		api "org.openid4java:openid4java-nodeps:0.9.6"
-=======
->>>>>>> 8e018fd921 (Update to mockito 4.7.0)
 		api "org.opensaml:opensaml-core:$openSamlVersion"
 		api "org.opensaml:opensaml-saml-api:$openSamlVersion"
 		api "org.opensaml:opensaml-saml-impl:$openSamlVersion"