Fix bad merge
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/02774b98 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/02774b98 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/02774b98 Branch: refs/heads/DSL_SQL Commit: 02774b98e6e9f708f5563d235e262c115e595066 Parents: 5e0f258 Author: Kenneth Knowles <[email protected]> Authored: Thu Jul 6 21:45:39 2017 -0700 Committer: Tyler Akidau <[email protected]> Committed: Wed Jul 12 20:01:00 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/beam/runners/dataflow/TransformTranslator.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/02774b98/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/TransformTranslator.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/TransformTranslator.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/TransformTranslator.java index 7f61b6c..06ed1e0 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/TransformTranslator.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/TransformTranslator.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions; import org.apache.beam.runners.dataflow.util.OutputReference; import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.annotations.Internal; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.runners.AppliedPTransform; import org.apache.beam.sdk.transforms.PTransform;
