You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/04/07 21:57:17 UTC
incubator-beam git commit: Fix up conflict markers
Repository: incubator-beam
Updated Branches:
refs/heads/master 6467afb74 -> 1451a0ec9
Fix up conflict markers
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1451a0ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1451a0ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1451a0ec
Branch: refs/heads/master
Commit: 1451a0ec92c1d8c3a86e0a1518c04b3ebd8520e2
Parents: 6467afb
Author: Kenneth Knowles <kl...@google.com>
Authored: Thu Apr 7 12:57:02 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Thu Apr 7 12:57:02 2016 -0700
----------------------------------------------------------------------
.../test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1451a0ec/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java
index a17d153..5a9a8c6 100644
--- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java
+++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java
@@ -41,13 +41,7 @@ import com.google.cloud.dataflow.sdk.testing.TestPipeline;
import com.google.cloud.dataflow.sdk.transforms.Create;
import com.google.cloud.dataflow.sdk.transforms.PTransform;
import com.google.cloud.dataflow.sdk.util.CoderUtils;
-<<<<<<< HEAD
-import com.google.cloud.dataflow.sdk.util.GcsUtil;
import com.google.cloud.dataflow.sdk.util.IOChannelUtils;
-import com.google.cloud.dataflow.sdk.util.TestCredential;
-import com.google.cloud.dataflow.sdk.util.gcsfs.GcsPath;
-=======
->>>>>>> a8a3419... [BEAM-151] Break out Dataflow runner specific tests to separate file
import com.google.cloud.dataflow.sdk.values.PCollection;
import com.google.cloud.dataflow.sdk.values.PDone;
import com.google.common.collect.ImmutableList;