From ee3320f759dadd69df782581cf59161528e2d9f3 Mon Sep 17 00:00:00 2001
From: David Noble <David.Noble@microsoft.com>
Date: Mon, 23 Sep 2019 11:34:55 -0700
Subject: [PATCH] Move RowScanner and DataItem out of test into main

---
 .../serialization/hybridrow/io/RowScanner.java      | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/java/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowScanner.java b/java/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowScanner.java
index ce9da27..3fdc7c4 100644
--- a/java/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowScanner.java
+++ b/java/src/main/java/com/azure/data/cosmos/serialization/hybridrow/io/RowScanner.java
@@ -50,11 +50,7 @@ public class RowScanner implements AutoCloseable {
         }
     }
 
-<<<<<<< HEAD
     public static RowScanner open(@Nonnull Namespace namespace, @Nonnull File file) throws IOException {
-=======
-    public static RowScanner of(@Nonnull Namespace namespace, @Nonnull File file) throws IOException {
->>>>>>> 463cc8aaa89552b84bbc60d95d58f9be3d12d8c1
 
         checkNotNull(file, "expected non-null file");
 
@@ -72,21 +68,12 @@ public class RowScanner implements AutoCloseable {
         return new RowScanner(resolver, data);
     }
 
-<<<<<<< HEAD
     public static RowScanner open(@Nonnull Namespace namespace, @Nonnull Path path) throws IOException {
         return RowScanner.open(namespace, requireNonNull(path, "expected non-null path").toFile());
     }
 
     public static RowScanner open(@Nonnull Namespace namespace, @Nonnull String path) throws IOException {
         return RowScanner.open(namespace, new File(requireNonNull(path, "expected non-null path")));
-=======
-    public static RowScanner of(@Nonnull Namespace namespace, @Nonnull Path path) throws IOException {
-        return RowScanner.of(namespace, requireNonNull(path, "expected non-null path").toFile());
-    }
-
-    public static RowScanner of(@Nonnull Namespace namespace, @Nonnull String path) throws IOException {
-        return RowScanner.of(namespace, new File(requireNonNull(path, "expected non-null path")));
->>>>>>> 463cc8aaa89552b84bbc60d95d58f9be3d12d8c1
     }
 
     public <TContext> Result visit(BiFunction<DataItem, TContext, Result> accept, TContext context) {