Merge remote-tracking branch 'database/main'

This commit is contained in:
2023-05-23 13:58:13 +02:00
7 changed files with 61 additions and 39 deletions

View File

@@ -1,2 +1,11 @@
.idea
.vscode
<<<<<<< HEAD
=======
<<<<<<<< HEAD:.gitignore
.turbo
node_modules
========
.DS_Store
>>>>>>>> database/main:backend/database/.gitignore
>>>>>>> database/main