From 36d0d8a948a3f03026edf24bb49072558f8bb7f4 Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Fri, 24 Apr 2020 11:50:20 +0200 Subject: [PATCH] fixing merge error --- tools/azure-sdk-tools/packaging_tools/templates/setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/azure-sdk-tools/packaging_tools/templates/setup.py b/tools/azure-sdk-tools/packaging_tools/templates/setup.py index 9332e81a57dd..acd7d3c51b63 100644 --- a/tools/azure-sdk-tools/packaging_tools/templates/setup.py +++ b/tools/azure-sdk-tools/packaging_tools/templates/setup.py @@ -35,7 +35,6 @@ except ImportError: pass -# Version extraction inspired from 'requests' # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, 'version.py') if os.path.exists(os.path.join(package_folder_path, 'version.py'))