Merge remote-tracking branch 'origin/main'

This commit is contained in:
Janus Knudsen 2025-01-23 17:20:02 +01:00
commit 7dae58ec1e

View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<<<<<<< HEAD
<diagram version="1" name="global.erd"> <diagram version="1" name="global.erd">
<entities> <entities>
<data-source id="postgres-jdbc-1948450a8b4-5fc9eec404e65c44"> <data-source id="postgres-jdbc-1948450a8b4-5fc9eec404e65c44">
@ -21,4 +22,9 @@
<relation name="tenants_created_by_fkey" fq-name="swp.tenants.tenants_created_by_fkey" type="fk" pk-ref="3" fk-ref="1"/> <relation name="tenants_created_by_fkey" fq-name="swp.tenants.tenants_created_by_fkey" type="fk" pk-ref="3" fk-ref="1"/>
<relation name="user_tenants_user_id_fkey" fq-name="swp.user_tenants.user_tenants_user_id_fkey" type="fk" pk-ref="3" fk-ref="2"/> <relation name="user_tenants_user_id_fkey" fq-name="swp.user_tenants.user_tenants_user_id_fkey" type="fk" pk-ref="3" fk-ref="2"/>
</relations> </relations>
=======
<diagram version="1" name="global">
<entities/>
<relations/>
>>>>>>> origin/main
</diagram> </diagram>