remove cherry pick noise

Automattic · Jan 25, 2022 · f6a15e6 · f6a15e6
1 parent 372a611
commit f6a15e6
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.github/files/build-all-projects.sh b/.github/files/build-all-projects.sh
@@ -187,8 +187,6 @@ for SLUG in "${SLUGS[@]}"; do
 		# Copy the resulting list of files into the clone.
 		xargs cp --parents --target-directory="$BUILD_DIR"
 
-<<<<<<< HEAD
-=======
 	if [[ "$SLUG" == "plugins/jetpack" || "$SLUG" == "plugins/backup" ]]; then
 		echo "::group::Copying Jetpack files for backward compatibility."
 
@@ -223,7 +221,6 @@ for SLUG in "${SLUGS[@]}"; do
 		echo "::endgroup::"
 	fi
 
->>>>>>> dace448b93 (Add backup to previous vendor copy logic (#22451))
 	# Remove monorepo repos from composer.json
 	JSON=$(jq --tab 'if .repositories then .repositories |= map( select( .options.monorepo | not ) ) else . end' "$BUILD_DIR/composer.json")
 	if [[ "$JSON" != "$(<"$BUILD_DIR/composer.json")" ]]; then