4e1bf9c973
# Conflicts: # src/main/resources/static/css/main.css # src/main/resources/static/css/main.css.map # src/main/resources/static/sass/abstracts/_variables.scss