From 978fe2671eb811c3a1dd8193e49f0cfd0e6ef46b Mon Sep 17 00:00:00 2001
From: "Pfifer, Justin" <pfifer@amazon.com>
Date: Thu, 2 Aug 2018 12:32:44 -0700
Subject: [PATCH] Cleanup a merge artifact

---
 .../multilang}/config/DatePropertyValueDecoderTest.java      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
 rename {src/test/java/com/amazonaws/services/kinesis/clientlibrary => amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang}/config/DatePropertyValueDecoderTest.java (89%)

diff --git a/src/test/java/com/amazonaws/services/kinesis/clientlibrary/config/DatePropertyValueDecoderTest.java b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/DatePropertyValueDecoderTest.java
similarity index 89%
rename from src/test/java/com/amazonaws/services/kinesis/clientlibrary/config/DatePropertyValueDecoderTest.java
rename to amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/DatePropertyValueDecoderTest.java
index df405978..7c5cd8f3 100644
--- a/src/test/java/com/amazonaws/services/kinesis/clientlibrary/config/DatePropertyValueDecoderTest.java
+++ b/amazon-kinesis-client-multilang/src/test/java/com/amazonaws/services/kinesis/multilang/config/DatePropertyValueDecoderTest.java
@@ -12,17 +12,14 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.amazonaws.services.kinesis.clientlibrary.config;
+package com.amazonaws.services.kinesis.multilang.config;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 import java.util.Date;
 
 import org.junit.Test;
 
-import com.amazonaws.services.kinesis.clientlibrary.config.DatePropertyValueDecoder;
-
 public class DatePropertyValueDecoderTest {
 
     private DatePropertyValueDecoder decoder = new DatePropertyValueDecoder();