9d2b7b2c192cd4f7b9ef45cdb724f9b855ad694a
# Conflicts: # .gitlab-ci.yml # src/main/java/ru/kayashov/bar/controller/CocktailController.java # src/main/resources/application.properties
Description
# Conflicts: # .gitlab-ci.yml # src/main/java/ru/kayashov/bar/controller/CocktailController.java # src/main/resources/application.properties