Chore/resolve master merge conflict

qbicsoftware / offer-manager-2-portlet

The offer manager assists in creating offers with version control and person master data handling.

MIT License

2 stars 1 forks source link

Closed Steffengreiner closed 2 years ago

Steffengreiner commented 2 years ago

Resolves the merge conflict between the updated workflows and removed outdated files on master and development

jenniferboedker commented 2 years ago

Why not merging to master and then update dev from master?