From b884f2088c91185ccaa8c6d89cef3f7b40552334 Mon Sep 17 00:00:00 2001
From: spencergibb <sgibb@pivotal.io>
Date: Mon, 29 Mar 2021 17:08:11 -0400
Subject: [PATCH] Fixes merge mistakes

---
 spring-cloud-config-server/pom.xml                        | 2 +-
 .../authentication/PcfClientAuthenticationProvider.java   | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
index 864a8e61..f2a63d24 100644
--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>2.2.7.BUILD-SNAPSHOT</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/authentication/PcfClientAuthenticationProvider.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/authentication/PcfClientAuthenticationProvider.java
index 38a9e471..ef4bc33f 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/authentication/PcfClientAuthenticationProvider.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/authentication/PcfClientAuthenticationProvider.java
@@ -52,10 +52,6 @@ public class PcfClientAuthenticationProvider extends SpringVaultClientAuthentica
 		else {
 			builder.instanceCertificate(new ResourceCredentialSupplier(resolveEnvVariable("CF_INSTANCE_CERT")));
 		}
-		else {
-			builder.instanceCertificate(new ResourceCredentialSupplier(
-					resolveEnvVariable("CF_INSTANCE_CERT")));
-		}
 
 		if (pcfProperties.getInstanceKey() != null) {
 			builder.instanceKey(new ResourceCredentialSupplier(pcfProperties.getInstanceKey()));
@@ -63,10 +59,6 @@ public class PcfClientAuthenticationProvider extends SpringVaultClientAuthentica
 		else {
 			builder.instanceKey(new ResourceCredentialSupplier(resolveEnvVariable("CF_INSTANCE_KEY")));
 		}
-		else {
-			builder.instanceKey(new ResourceCredentialSupplier(
-					resolveEnvVariable("CF_INSTANCE_KEY")));
-		}
 
 		return new PcfAuthentication(builder.build(), vaultRestOperations);
 	}