# Conflicts:
#   src/main/webapp/app/editorialPages/pages.component.html
#   src/main/webapp/app/exercise/exercise-details/exercise-details.component.html
#   src/main/webapp/app/home/home.component.html
#   src/main/webapp/app/layouts/footer/footer.component.html
#   src/main/webapp/app/layouts/main/main.component.html
#   src/main/webapp/app/teaserContent/teaserContent.component.html