You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ur...@apache.org on 2022/04/15 01:34:41 UTC
[pulsar] branch master updated: [fix][website] website build fail due to conflict (#15179)
This is an automated email from the ASF dual-hosted git repository.
urfree pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new a5887875c78 [fix][website] website build fail due to conflict (#15179)
a5887875c78 is described below
commit a5887875c7892d83d73195f83810c8ab4034a36c
Author: Li Li <ur...@apache.org>
AuthorDate: Fri Apr 15 09:34:35 2022 +0800
[fix][website] website build fail due to conflict (#15179)
---
site2/tools/build-site.sh | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/site2/tools/build-site.sh b/site2/tools/build-site.sh
index 758b5c18284..09e7ff1648d 100755
--- a/site2/tools/build-site.sh
+++ b/site2/tools/build-site.sh
@@ -30,10 +30,7 @@ function workaround_crowdin_problem_by_copying_files() {
cp versioned_docs/version-2.5.1/functions-develop.md translated_docs/zh-CN/version-2.5.1/functions-develop.md
cp versioned_docs/version-2.5.2/functions-develop.md translated_docs/zh-CN/version-2.5.2/functions-develop.md
cp versioned_docs/version-2.5.1/client-libraries-java.md translated_docs/zh-CN/version-2.5.1/client-libraries-java.md
-<<<<<<< HEAD
cp versioned_docs/version-2.5.0/client-libraries-java.md translated_docs/zh-CN/version-2.5.0/client-libraries-java.md
-=======
->>>>>>> up/master
cp versioned_docs/version-2.5.1/security-jwt.md translated_docs/zh-CN/version-2.5.1/security-jwt.md
cp versioned_docs/version-2.4.2/functions-develop.md translated_docs/ja/version-2.4.2/functions-develop.md
@@ -42,10 +39,7 @@ function workaround_crowdin_problem_by_copying_files() {
cp versioned_docs/version-2.5.1/functions-develop.md translated_docs/ja/version-2.5.1/functions-develop.md
cp versioned_docs/version-2.5.2/functions-develop.md translated_docs/ja/version-2.5.2/functions-develop.md
cp versioned_docs/version-2.5.1/client-libraries-java.md translated_docs/ja/version-2.5.1/client-libraries-java.md
-<<<<<<< HEAD
cp versioned_docs/version-2.5.0/client-libraries-java.md translated_docs/ja/version-2.5.0/client-libraries-java.md
-=======
->>>>>>> up/master
cp versioned_docs/version-2.5.1/security-jwt.md translated_docs/ja/version-2.5.1/security-jwt.md
cp versioned_docs/version-2.4.2/functions-develop.md translated_docs/fr/version-2.4.2/functions-develop.md
@@ -54,10 +48,7 @@ function workaround_crowdin_problem_by_copying_files() {
cp versioned_docs/version-2.5.1/functions-develop.md translated_docs/fr/version-2.5.1/functions-develop.md
cp versioned_docs/version-2.5.2/functions-develop.md translated_docs/fr/version-2.5.2/functions-develop.md
cp versioned_docs/version-2.5.1/client-libraries-java.md translated_docs/fr/version-2.5.1/client-libraries-java.md
-<<<<<<< HEAD
cp versioned_docs/version-2.5.0/client-libraries-java.md translated_docs/fr/version-2.5.0/client-libraries-java.md
-=======
->>>>>>> up/master
cp versioned_docs/version-2.5.1/security-jwt.md translated_docs/fr/version-2.5.1/security-jwt.md
cp versioned_docs/version-2.4.2/functions-develop.md translated_docs/zh-TW/version-2.4.2/functions-develop.md
@@ -66,10 +57,7 @@ function workaround_crowdin_problem_by_copying_files() {
cp versioned_docs/version-2.5.1/functions-develop.md translated_docs/zh-TW/version-2.5.1/functions-develop.md
cp versioned_docs/version-2.5.2/functions-develop.md translated_docs/zh-TW/version-2.5.2/functions-develop.md
cp versioned_docs/version-2.5.1/client-libraries-java.md translated_docs/zh-TW/version-2.5.1/client-libraries-java.md
-<<<<<<< HEAD
cp versioned_docs/version-2.5.0/client-libraries-java.md translated_docs/zh-TW/version-2.5.0/client-libraries-java.md
-=======
->>>>>>> up/master
cp versioned_docs/version-2.5.1/security-jwt.md translated_docs/zh-TW/version-2.5.1/security-jwt.md
cp versioned_docs/version-2.4.2/functions-develop.md translated_docs/ko/version-2.4.2/functions-develop.md
@@ -78,10 +66,7 @@ function workaround_crowdin_problem_by_copying_files() {
cp versioned_docs/version-2.5.1/functions-develop.md translated_docs/ko/version-2.5.1/functions-develop.md
cp versioned_docs/version-2.5.2/functions-develop.md translated_docs/ko/version-2.5.2/functions-develop.md
cp versioned_docs/version-2.5.1/client-libraries-java.md translated_docs/ko/version-2.5.1/client-libraries-java.md
-<<<<<<< HEAD
cp versioned_docs/version-2.5.0/client-libraries-java.md translated_docs/ko/version-2.5.0/client-libraries-java.md
-=======
->>>>>>> up/master
cp versioned_docs/version-2.5.1/security-jwt.md translated_docs/ko/version-2.5.1/security-jwt.md
cp ../docs/client-libraries-java.md translated_docs/zh-CN/client-libraries-java.md