OpenSlides / openslides-meta

MIT License
0 stars 12 forks source link

Fix cherry-pick for merge commits #44

Closed openslides-automation[bot] closed 8 months ago

openslides-automation[bot] commented 8 months ago

Triggered by commit 6144f642463f1506ae13162648ce3542e7ebe737

There were conflicts during the cherry-pick. These were commited without any resolving. Please resolve them manually and push the result to this branch before merging.