Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 10 Jahren
..
app.js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 10 Jahren
controllers.js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 10 Jahren
services.js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 10 Jahren