# Conflicts:
#	frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue