update merge branch

earthmant · earthmant · commit a4d136839230 · 2020-12-15T21:15:02.000+02:00
diff --git a/.circleci/merge_docs.py b/.circleci/merge_docs.py
@@ -1,4 +1,4 @@
 from ecosystem_cicd_tools.github_stuff import merge_documentation_pulls
 
 if __name__ == '__main__':
-    merge_documentation_pulls()
+    merge_documentation_pulls(branch='main')
diff --git a/plugin.yaml b/plugin.yaml
@@ -1,4 +1,5 @@
 plugins:
+
   vcd:
     executor: central_deployment_agent
     package_name: cloudify-vcloud-plugin

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`plugins:`
	`2`	`+`
`2`	`3`	`vcd:`
`3`	`4`	`executor: central_deployment_agent`
`4`	`5`	`package_name: cloudify-vcloud-plugin`