fix merge

Author: remyUilicious

src/test/java/picoded/dstack/redis/Redis_KeyLongMap_test.java

@@ -6,23 +6,15 @@
 
 import java.util.concurrent.ThreadLocalRandom;
 
-<<<<<<< HEAD
 public class Redis_KeyLongMap_test extends StructSimple_KeyLongMap_test {
-=======
-public class RedisKeyLongMap_test extends StructSimple_KeyLongMap_test {
->>>>>>> ba5858da6960b26e62926ee51c1e3f547b58774f
 	// Redis stack instance
 	protected static volatile RedisStack instance = null;
 
 	/// Implementation constructor
 	public KeyLongMap implementationConstructor() {
 
 		// Initialize server
-<<<<<<< HEAD
 		synchronized (Redis_KeyLongMap_test.class) {
-=======
-		synchronized (RedisKeyLongMap_test.class) {
->>>>>>> ba5858da6960b26e62926ee51c1e3f547b58774f
 			if (instance == null) {
 				// The default config uses "172.17.0.1" (default docker bridge address) 
 				// and port 6379 (default redis port)
@@ -42,12 +34,6 @@ public KeyLongMap implementationConstructor() {
 			}
 		}
 		// Load the KeyLongMap
-<<<<<<< HEAD
 		return instance.keyLongMap(DStackTestConfig.randomTablePrefix());
 	}
 }
-=======
-		return instance.KeyLongMap(DStackTestConfig.randomTablePrefix());
-	}
-}
->>>>>>> ba5858da6960b26e62926ee51c1e3f547b58774f

src/test/java/picoded/dstack/redis/Redis_KeyValueMap_test.java

@@ -7,23 +7,15 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 
-<<<<<<< HEAD
 public class Redis_KeyValueMap_test extends StructSimple_KeyValueMap_test {
-=======
-public class RedisKeyValueMap_test extends StructSimple_KeyValueMap_test {
->>>>>>> ba5858da6960b26e62926ee51c1e3f547b58774f
 	// Redis stack instance
 	protected static volatile RedisStack instance = null;
 
 	/// Implementation constructor
 	public KeyValueMap implementationConstructor() {
 
 		// Initialize server
-<<<<<<< HEAD
 		synchronized (Redis_KeyValueMap_test.class) {
-=======
-		synchronized (RedisKeyValueMap_test.class) {
->>>>>>> ba5858da6960b26e62926ee51c1e3f547b58774f
 			if (instance == null) {
 				// The default config uses "172.17.0.1" (default docker bridge address) 
 				// and port 6379 (default redis port)
@@ -45,8 +37,4 @@ public KeyValueMap implementationConstructor() {
 		// Load the KeyValueMap
 		return instance.keyValueMap(DStackTestConfig.randomTablePrefix());
 	}
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> ba5858da6960b26e62926ee51c1e3f547b58774f