# Conflicts:
#	app/Http/Controllers/Api/EvaluationsController.php
#	resources/js/components/Auth/Login.vue
#	resources/js/components/Collectivities/List.vue
#	resources/js/components/Collectivities/Single/index.vue
#	resources/js/components/Evaluations/List.vue
#	resources/js/components/Evaluations/Single/Components/Buttons.vue
#	resources/js/components/Evaluations/Single/Components/MeasureLevelCircle.vue
#	resources/js/components/Evaluations/Single/Components/Step1/DangerLine.vue
#	resources/js/components/Evaluations/Single/Components/Step2/MeasureLevel.vue
#	resources/js/components/Evaluations/Single/Components/Step2/MeasureLevelChooser.vue
#	resources/js/components/Evaluations/Single/Components/Step2/MeasureLevelSelector.vue
#	resources/js/components/Evaluations/Single/Components/Step3/Graph1.vue
#	resources/js/components/Evaluations/Single/Components/Step4/MeasureLevelDetails.vue
#	resources/js/components/Evaluations/Single/Components/Steps.vue
#	resources/js/components/Evaluations/Single/Edit/index.vue
#	resources/js/components/Evaluations/Single/Steps/Step2.vue
#	resources/js/components/Evaluations/Single/Steps/Step3.vue
#	resources/js/components/Evaluations/Single/Steps/Step4.vue
#	resources/js/components/Evaluations/Single/index.vue
#	resources/js/components/Measures/Single/LevelBlock.vue
#	resources/js/components/Measures/Single/index.vue
#	resources/js/components/Pagination/CustomPagination.vue
#	resources/js/components/Users/List.vue