From 2248639e8b74baf583aae5aa609e28c355f37f3e Mon Sep 17 00:00:00 2001 From: Maurizio Noseda Pedraglio Date: Fri, 14 Oct 2022 13:02:05 +0200 Subject: [PATCH] fixed merge --- .../network-dashboard/cloud-function/main.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/blueprints/cloud-operations/network-dashboard/cloud-function/main.py b/blueprints/cloud-operations/network-dashboard/cloud-function/main.py index 8bf59c225..84bf007cf 100644 --- a/blueprints/cloud-operations/network-dashboard/cloud-function/main.py +++ b/blueprints/cloud-operations/network-dashboard/cloud-function/main.py @@ -218,19 +218,6 @@ def main(event, context): return 'Function execution completed' -<<<<<<< HEAD -if __name__ == "__main__": - main(None, None) -======= -if CFv2: - - @functions_framework.http - def main_http(request): - main(None, None) -else: - if __name__ == "__main__": - main(None, None) ->>>>>>> 68980127fdbfb079f4b1a041234d750bc7175c84 if CFv2: @@ -239,4 +226,4 @@ if CFv2: main(None, None) else: if __name__ == "__main__": - main(None, None) \ No newline at end of file + main(None, None)