This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.11 by this push:
new 9809aef [hotfix][build] Fix merge conflict
9809aef is described below
commit 9809aefa46062abc0f36c29cae370ca6045e8108
Author: Chesnay Schepler <[email protected]>
AuthorDate: Mon Dec 7 12:34:32 2020 +0100
[hotfix][build] Fix merge conflict
---
flink-examples/flink-examples-table/pom.xml | 8 --------
1 file changed, 8 deletions(-)
diff --git a/flink-examples/flink-examples-table/pom.xml
b/flink-examples/flink-examples-table/pom.xml
index 56ddd78..93e90f6 100644
--- a/flink-examples/flink-examples-table/pom.xml
+++ b/flink-examples/flink-examples-table/pom.xml
@@ -236,13 +236,9 @@ under the License.
</archive>
<includes>
-<<<<<<< HEAD
<include>org/apache/flink/table/examples/scala/StreamTableExample*</include>
-=======
-
<include>org/apache/flink/table/examples/scala/basics/StreamTableExample*</include>
<include>META-INF/LICENSE</include>
<include>META-INF/NOTICE</include>
->>>>>>> 8fe1928da5... [FLINK-20455][build][legal] Bundle LICENSE/NOTICE in
various deployed jars
</includes>
</configuration>
</execution>
@@ -264,13 +260,9 @@ under the License.
</archive>
<includes>
-<<<<<<< HEAD
<include>org/apache/flink/table/examples/scala/TPCHQuery3Table*</include>
-=======
-
<include>org/apache/flink/table/examples/scala/basics/TPCHQuery3Table*</include>
<include>META-INF/LICENSE</include>
<include>META-INF/NOTICE</include>
->>>>>>> 8fe1928da5... [FLINK-20455][build][legal] Bundle LICENSE/NOTICE in
various deployed jars
</includes>
</configuration>
</execution>
