This is an automated email from the ASF dual-hosted git repository.
Yicong-Huang pushed a commit to branch
backport/6958-add-missing-license-headers-to-docs-v1.2
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to
refs/heads/backport/6958-add-missing-license-headers-to-docs-v1.2 by this push:
new 98a5da4660 fix(v1.2): resolve backport conflict in bin/README.md
98a5da4660 is described below
commit 98a5da466070bf10fe6025b860f659979e773bd0
Author: Yicong Huang <[email protected]>
AuthorDate: Tue Jul 28 22:24:21 2026 -0400
fix(v1.2): resolve backport conflict in bin/README.md
Keep the release/v1.2 title (# Texera Deployment) and add the ASF
license header from #6958. bin/local-dev/README.md was already resolved.
---
bin/README.md | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/bin/README.md b/bin/README.md
index 0e82a20407..dfba4e8bd7 100644
--- a/bin/README.md
+++ b/bin/README.md
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-# Texera Deployment
-=======
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -20,8 +17,7 @@
~ under the License.
-->
-# `bin/`
->>>>>>> 214402f05 (fix: Add missing license headers to Docs (#6958))
+# Texera Deployment
This directory contains Dockerfiles and configuration files for building and
deploying Texera's microservices.
