Cleanup from incorrect rebase

Author: fmichielssen

pom.xml

@@ -376,11 +376,4 @@
 			</plugin>
 		</plugins>
 	</build>
-<<<<<<< Upstream, based on origin/develop
-=======
-
-<<<<<<< HEAD
->>>>>>> 2861317 Fix /api/route/{id} endpoint after Undertow upgrade
-=======
->>>>>>> branch 'feature/22879' of https://scm.openanalytics.eu/git/containerproxy.git
 </project>

src/main/java/eu/openanalytics/containerproxy/auth/impl/kerberos/KRBUtils.java

@@ -173,21 +173,12 @@ public static SgtTicket obtainBackendServiceTicket(String backendServiceName, Ti
 		}
 
 		// Make a S4U2Proxy request to get a backend ST
-<<<<<<< Upstream, based on origin/develop
 		sun.security.krb5.Credentials creds = sun.security.krb5.internal.CredentialsUtil.acquireS4U2proxyCreds(
 				backendServiceName,
 				sunTicket,
 				serviceTGTCreds.getClient(),
 				serviceTGTCreds);
 
-=======
-		sun.security.krb5.KrbTgsReq req = new sun.security.krb5.KrbTgsReq(
-				serviceTGTCreds,
-				sunTicket,
-				new sun.security.krb5.PrincipalName(backendServiceName));
-		sun.security.krb5.Credentials creds = req.sendAndGetCreds();
-
->>>>>>> 84a4908 Fix TODOs
 		SgtTicket sgtTicket = convertToTicket(creds, backendServiceName, proxyServiceTicket.getRealm());
 		return sgtTicket;
 	}