# Conflicts: # .gitlab-ci.yml # .idea/misc.xml # .idea/vcs.xml # banguardian-server/pom.xml # banguardian-server/src/main/resources/application.yaml
