Merge collisions in master before upgrading 4.x.

opendevstack / ods-provisioning-app

Provisioning app, which triggers project and component provisions (including Jira / Confluence / BitBucket and OCP resource creation)

Apache License 2.0

15 stars 20 forks source link

Merge collisions in master before upgrading 4.x. #742

Closed victorpablosceruelo closed 1 year ago

victorpablosceruelo commented 1 year ago

There are too many differences between 4.x and master. We need to compile and test everything in master before merge contents of master into 4.x. Sorry for the inconvenience.