From 87fad09c7b34a79311f6b120158e2c2cc0a6175d Mon Sep 17 00:00:00 2001
From: Edward Chen <18449977+edgchen1@users.noreply.github.com>
Date: Tue, 21 Apr 2020 03:44:44 +0000
Subject: [PATCH] Fix merge issue.

---
 tools/ci_build/build.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
index 5c12a8ac26..09a2fc97a8 100755
--- a/tools/ci_build/build.py
+++ b/tools/ci_build/build.py
@@ -307,7 +307,6 @@ def parse_arguments():
         "--use_acl", nargs="?", const="ACL_1905",
         choices=["ACL_1902", "ACL_1905", "ACL_1908"],
         help="Build with ACL for ARM architectures.")
->>>>>>> origin/master
     return parser.parse_args()