Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

First prototype #5

Merged
merged 6 commits into from
May 23, 2022
Merged

First prototype #5

merged 6 commits into from
May 23, 2022

Conversation

MauriceLe
Copy link
Contributor

No description provided.

backend/src/main.ts Outdated Show resolved Hide resolved
backend/src/rabbitmq/index.ts Outdated Show resolved Hide resolved
- Dotenv -> DATABASE_URL
=======
- Dotenv -> DATABASE_URL
>>>>>>> 84bab5aa40a7a33e815b29f4ed8c4d438a0931b5
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wieso sind hier noch unsolved merge conflicts drin?

@Flamtky Flamtky merged commit eca7e07 into master May 23, 2022
@Flamtky Flamtky deleted the develop branch May 23, 2022 20:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
Status: Done
3 participants