Merge conflicts

ampproject · Aug 2, 2021 · 4e6f7e6 · 4e6f7e6
2 parents 75ab5c2 + c243a8b
commit 4e6f7e6
Show file tree

Hide file tree

Showing 266 changed files with 6,823 additions and 3,214 deletions.
diff --git a/.circleci/check_config.sh b/.circleci/check_config.sh
@@ -20,8 +20,8 @@
 set -e
 err=0
 
-GREEN() { echo -e "\n\033[0;32m$1\033[0m"; }
-RED() { echo -e "\n\033[0;31m$1\033[0m"; }
+GREEN() { echo -e "\033[0;32m$1\033[0m"; }
+RED() { echo -e "\033[0;31m$1\033[0m"; }
 YELLOW() { echo -e "\033[0;33m$1\033[0m"; }
 CYAN() { echo -e "\033[0;36m$1\033[0m"; }