From 7d785bdb55aa43840de45f8084bf26f6583a5f02 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 17 Jan 2017 11:18:24 -0700
Subject: [PATCH] fixed merge error in test

---
 .../springframework/cloud/consul/config/ConfigWatchTests.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConfigWatchTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConfigWatchTests.java
index 0d23e898..5bd2c75c 100644
--- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConfigWatchTests.java
+++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConfigWatchTests.java
@@ -107,9 +107,8 @@ public class ConfigWatchTests {
 		Response<List<GetValue>> response = new Response<>(getValues, 1L, false, 1L);
 		when(consul.getKVValues(eq(context), anyString(), any(QueryParams.class))).thenReturn(response);
 
-		ConsulConfigProperties properties = new ConsulConfigProperties();
 		if (StringUtils.hasText(aclToken)) {
-			properties.setAclToken(aclToken);
+			configProperties.setAclToken(aclToken);
 		}
 
 		ConfigWatch watch = new ConfigWatch(configProperties, Arrays.asList(context), consul);