fixed merge

2022-10-14 13:02:05 +02:00
parent 801fe1c626
commit 2248639e8b
1 changed files with 1 additions and 14 deletions
--- 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)
+    main(None, None)