Merge Conflicts

How on earth can there be 104 (!) merge conflicts?

If it's caused by my yarn.lock or package-lock.json feel free to delete them, I can recreate them later.

added 4 commits

• 3f8a7414 - 1 commit from branch master
• 41326e46 - Merge branch 'master' into dev
• b059ef34 - fixed some deletion bugs, merge should now be complete
• 4bf11384 - cannot have bi-directional relation

Compare with previous version

added 1 commit

• d0c525e3 - prevent runner from caching too much

Compare with previous version

added 1 commit

• 31ec52d9 - minor changes in tests, testing image not found with integration test

Compare with previous version

added 1 commit

• cfe6f27f - resolved the tests

Compare with previous version

added 1 commit

• 8ce3cba6 - integration test seems not to respect the database reset

Compare with previous version

added 1 commit

• 7a3b8042 - another attempt in fixing the integration tests, the entities seem to suffer from merge conflict

Compare with previous version

merged