Github user pnowojski commented on a diff in the pull request:
https://github.com/apache/flink/pull/6323#discussion_r202327344
--- Diff:
flink-libraries/flink-table/src/test/resources/META-INF/services/org.apache.flink.table.connectors.DiscoverableTableFactory
---
@@ -13,5 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+<<<<<<<
HEAD:flink-libraries/flink-table/src/test/resources/META-INF/services/org.apache.flink.table.sources.TableSourceFactory
--- End diff --
?
---
