Cleanup a merge artifact

This commit is contained in:
Pfifer, Justin 2018-08-02 12:32:44 -07:00
parent 258be9a504
commit 978fe2671e

View file

@ -12,17 +12,14 @@
* express or implied. See the License for the specific language governing * express or implied. See the License for the specific language governing
* permissions and limitations under the License. * 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.assertEquals;
import static org.junit.Assert.fail;
import java.util.Date; import java.util.Date;
import org.junit.Test; import org.junit.Test;
import com.amazonaws.services.kinesis.clientlibrary.config.DatePropertyValueDecoder;
public class DatePropertyValueDecoderTest { public class DatePropertyValueDecoderTest {
private DatePropertyValueDecoder decoder = new DatePropertyValueDecoder(); private DatePropertyValueDecoder decoder = new DatePropertyValueDecoder();