From 9d96d7e98b7f9e3da892677a6a6cf15905374cd2 Mon Sep 17 00:00:00 2001 From: Jae Kim Date: Thu, 23 Feb 2017 10:32:45 -0800 Subject: [PATCH] Fixed incorrectly resolved conflicts --- script/release-binary | 3 --- 1 file changed, 3 deletions(-) diff --git a/script/release-binary b/script/release-binary index 4c7d6b5882d..0ff4dd63f91 100755 --- a/script/release-binary +++ b/script/release-binary @@ -44,7 +44,6 @@ sha256sum "${BINARY_NAME}" > "${SHA256_NAME}" # Copy it to the bucket. echo "Copying ${BINARY_NAME} ${SHA256_NAME} to ${DST}/" gsutil cp "${BINARY_NAME}" "${SHA256_NAME}" "${DST}/" -<<<<<<< HEAD # Build the debug binary BINARY_NAME="envoy-debug-${SHA}.tar.gz" @@ -57,5 +56,3 @@ sha256sum "${BINARY_NAME}" > "${SHA256_NAME}" # Copy it to the bucket. echo "Copying ${BINARY_NAME} ${SHA256_NAME} to ${DST}/" gsutil cp "${BINARY_NAME}" "${SHA256_NAME}" "${DST}/" -======= ->>>>>>> origin/rate_limiting