# Conflicts:
#	.env.dist
#	.env.test
#	assets/css/app.scss
#	composer.json
#	composer.lock
#	config/bundles.php
#	config/domain/aipd/translations/messages.fr.yaml
#	config/domain/documentation/translations/messages.fr.yaml
#	config/domain/notification/routes/notification.yaml
#	config/domain/notification/translations/messages.fr.yaml
#	config/domain/registry/translations/messages.fr.yaml
#	config/domain/user/translations/messages.fr.yaml
#	config/packages/framework.yaml
#	config/packages/knpu_oauth2_client.yaml
#	config/packages/security.yaml
#	config/packages/twig.yaml
#	config/parameters.yaml
#	config/services.yaml
#	doc/developpement/1-lancer-stack-developpement.md
#	docker/nginx/default
#	docs/docutilisateur.md
#	fixtures/3-conformite-organisation-2-question.yaml
#	fixtures/5-documentation_0_categories.yaml
#	migrations/Version20200630083312.php
#	migrations/Version20220516133955.php
#	migrations/Version20221227132203.php
#	package-lock.json
#	public/images/ConformiteAIPD.png
#	public/images/cycleAIPD.jpg
#	public/images/matriceAIPD.png
#	public/index.php
#	src/Application/Symfony/EventSubscriber/Kernel/AccessModuleConformiteSubscriber.php
#	src/Application/Traits/Model/HistoryTrait.php
#	src/Domain/AIPD/Controller/AnalyseImpactController.php
#	src/Domain/AIPD/Controller/ModeleAnalyseController.php
#	src/Domain/AIPD/Form/Type/AnalyseCriterePrincipeFondamentalType.php
#	src/Domain/AIPD/Form/Type/CriterePrincipeFondamentalType.php
#	src/Domain/AIPD/Form/Type/ImportModeleType.php
#	src/Domain/AIPD/Form/Type/ModeleAnalyseRightsType.php
#	src/Domain/AIPD/Model/AbstractMesureProtection.php
#	src/Domain/AIPD/Model/ModeleAnalyse.php
#	src/Domain/AIPD/Twig/Extension/AnalyseImpactExtension.php
#	src/Domain/Admin/Form/Type/DuplicationType.php
#	src/Domain/Documentation/Controller/DocumentController.php
#	src/Domain/Documentation/Form/Type/DocumentType.php
#	src/Domain/Documentation/Model/Category.php
#	src/Domain/Documentation/Model/Document.php
#	src/Domain/Notification/Command/NotificationsGenerateCommand.php
#	src/Domain/Notification/Command/NotificationsSendCommand.php
#	src/Domain/Notification/Controller/NotificationController.php
#	src/Domain/Notification/Dictionary/NotificationActionDictionary.php
#	src/Domain/Notification/Dictionary/NotificationModuleDictionary.php
#	src/Domain/Notification/Dictionary/NotificationStateDictionary.php
#	src/Domain/Notification/Model/Notification.php
#	src/Domain/Notification/Model/NotificationUser.php
#	src/Domain/Notification/Repository/Notification.php
#	src/Domain/Notification/Subscriber/NotificationEventSubscriber.php
#	src/Domain/Notification/Symfony/EventSubscriber/Doctrine/NotificationEventSubscriber.php
#	src/Domain/Notification/Twig/Extension/NotificationExtension.php
#	src/Domain/Registry/Controller/ConformiteOrganisationController.php
#	src/Domain/Registry/Controller/MesurementController.php
#	src/Domain/Registry/Controller/RequestController.php
#	src/Domain/Registry/Controller/TreatmentController.php
#	src/Domain/Registry/Controller/ViolationController.php
#	src/Domain/Registry/Dictionary/RequestCivilityDictionary.php
#	src/Domain/Registry/Dictionary/RequestObjectDictionary.php
#	src/Domain/Registry/Form/Type/ContractorType.php
#	src/Domain/Registry/Form/Type/MesurementType.php
#	src/Domain/Registry/Form/Type/ProofType.php
#	src/Domain/Registry/Form/Type/RequestType.php
#	src/Domain/Registry/Form/Type/TreatmentType.php
#	src/Domain/Registry/Form/Type/ViolationType.php
#	src/Domain/Registry/Model/Request.php
#	src/Domain/Registry/Model/Treatment.php
#	src/Domain/Registry/Model/Violation.php
#	src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
#	src/Domain/Reporting/Generator/Word/ConformiteTraitementGenerator.php
#	src/Domain/Reporting/Generator/Word/TreatmentGenerator.php
#	src/Domain/Reporting/Metrics/UserMetric.php
#	src/Domain/Reporting/Symfony/EventSubscriber/Doctrine/LogJournalDoctrineSubscriber.php
#	src/Domain/User/Controller/CollectivityController.php
#	src/Domain/User/Controller/SecurityController.php
#	src/Domain/User/Controller/UserController.php
#	src/Domain/User/Dictionary/CollectivityTypeDictionary.php
#	src/Domain/User/Dictionary/UserMoreInfoDictionary.php
#	src/Domain/User/Form/Type/CollectivityType.php
#	src/Domain/User/Form/Type/ContactType.php
#	src/Domain/User/Form/Type/EmailNotificationPreferenceType.php
#	src/Domain/User/Form/Type/UserType.php
#	src/Domain/User/Model/EmailNotificationPreference.php
#	src/Domain/User/Model/User.php
#	src/EventSubscriber/LogoutSubscriber.php
#	src/Infrastructure/ORM/AIPD/Repository/AnalyseImpact.php
#	src/Infrastructure/ORM/AIPD/Repository/ModeleAnalyse.php
#	src/Infrastructure/ORM/Maturity/Repository/Survey.php
#	src/Infrastructure/ORM/Notification/Repository/Notification.php
#	src/Infrastructure/ORM/Registry/Mapping/Treatment.orm.xml
#	src/Infrastructure/ORM/Registry/Mapping/Violation.orm.xml
#	src/Infrastructure/ORM/Registry/Repository/Request.php
#	src/Infrastructure/ORM/Registry/Repository/Treatment.php
#	src/Infrastructure/ORM/User/Mapping/User.orm.xml
#	src/Infrastructure/ORM/User/Repository/User.php
#	symfony.lock
#	templates/Admin/Duplication/new.html.twig
#	templates/Admin/Duplication/processing.html.twig
#	templates/Aipd/Analyse_impact/_form_critere.html.twig
#	templates/Aipd/Analyse_impact/_form_step_1.html.twig
#	templates/Aipd/Analyse_impact/_form_step_3.html.twig
#	templates/Aipd/Analyse_impact/create.html.twig
#	templates/Aipd/Analyse_impact/evaluation.html.twig
#	templates/Aipd/Analyse_impact/list.html.twig
#	templates/Aipd/Analyse_impact/pdf.html.twig
#	templates/Aipd/Analyse_impact/pdf_header.html.twig
#	templates/Aipd/Analyse_impact/validation.html.twig
#	templates/Aipd/Mesure_protection/list.html.twig
#	templates/Aipd/Modele_analyse/_form.html.twig
#	templates/Aipd/Modele_analyse/_form_criteres.html.twig
#	templates/Aipd/Modele_analyse/delete.html.twig
#	templates/Aipd/Modele_analyse/list.html.twig
#	templates/Documentation/Category/_form.html.twig
#	templates/Documentation/Category/create.html.twig
#	templates/Documentation/Category/delete.html.twig
#	templates/Documentation/Category/edit.html.twig
#	templates/Documentation/Category/list.html.twig
#	templates/Documentation/Document/_form.html.twig
#	templates/Documentation/Document/create.html.twig
#	templates/Documentation/Document/delete.html.twig
#	templates/Documentation/Document/delete_all.html.twig
#	templates/Documentation/Document/edit.html.twig
#	templates/Documentation/Document/grid.html.twig
#	templates/Documentation/Document/list.html.twig
#	templates/Maturity/Survey/list.html.twig
#	templates/Notification/Mail/notifications.html.twig
#	templates/Notification/Notification/box.html.twig
#	templates/Notification/Notification/delete.html.twig
#	templates/Notification/Notification/list_admin.html.twig
#	templates/Notification/Notification/list_user.html.twig
#	templates/Page/credit.html.twig
#	templates/Registry/Conformite_organisation/list.html.twig
#	templates/Registry/Conformite_traitement/list.html.twig
#	templates/Registry/Conformite_traitement/start.html.twig
#	templates/Registry/Contractor/_form.html.twig
#	templates/Registry/Contractor/delete_all.html.twig
#	templates/Registry/Contractor/list.html.twig
#	templates/Registry/Contractor/pdf_all.html.twig
#	templates/Registry/Mesurement/action_plan.html.twig
#	templates/Registry/Mesurement/delete_all.html.twig
#	templates/Registry/Mesurement/list.html.twig
#	templates/Registry/Mesurement/pdf_all.html.twig
#	templates/Registry/Mesurement/show.html.twig
#	templates/Registry/Proof/list.html.twig
#	templates/Registry/Request/delete_all.html.twig
#	templates/Registry/Request/list.html.twig
#	templates/Registry/Request/pdf_all.html.twig
#	templates/Registry/Treatment/_form.html.twig
#	templates/Registry/Treatment/_form_render.html.twig
#	templates/Registry/Treatment/archive_all.html.twig
#	templates/Registry/Treatment/delete_all.html.twig
#	templates/Registry/Treatment/list.html.twig
#	templates/Registry/Treatment/pdf.html.twig
#	templates/Registry/Treatment/pdf_all.html.twig
#	templates/Registry/Treatment/public_show.html.twig
#	templates/Registry/Treatment/show.html.twig
#	templates/Registry/Violation/_form.html.twig
#	templates/Registry/Violation/list.html.twig
#	templates/Registry/Violation/pdf_all.html.twig
#	templates/Registry/Violation/show.html.twig
#	templates/Reporting/Dashboard/index.html.twig
#	templates/Reporting/Dashboard/index_admin.html.twig
#	templates/Reporting/Journalisation/list.html.twig
#	templates/User/Collectivity/delete_processing.html.twig
#	templates/User/Collectivity/list.html.twig
#	templates/User/Profile/notifications.html.twig
#	templates/User/Profile/user_edit.html.twig
#	templates/User/User/_form.html.twig
#	templates/User/User/list.html.twig
#	templates/_Utils/_datatable.html.twig
#	templates/_Utils/_serverside_datatable.html.twig
#	templates/_Utils/_serverside_datatable_base.html.twig
#	templates/_Utils/_show_block_mesurements.html.twig
#	templates/_Utils/_show_block_requests.html.twig
#	templates/_Utils/_show_block_violations.html.twig
#	templates/_footer.html.twig
#	templates/_header.html.twig
#	templates/_sidebar.html.twig
#	templates/base_mail.html.twig
#	templates/base_public.html.twig
#	templates/base_publique.html.twig
#	tests/Domain/Notification/Subscriber/NotificationEventSubscriberTest.php
#	tests/Domain/Notification/Symfony/EventSubscriber/Doctrine/NotificationGenerationSubscriberTest.php
#	tests/Domain/Registry/Form/Type/TreatmentTypeTest.php
#	tests/Domain/Registry/Form/Type/ViolationTypeTest.php
#	tests/Domain/User/Controller/SecurityControllerTest.php
#	tests/Domain/User/Dictionary/UserRoleDictionaryTest.php
#	tests/Domain/User/Form/Type/ContactTypeTest.php
#	tests/Domain/User/Form/Type/UserTypeTest.php
#	tests/Functional/Domain/Notification/NotificationGenerationTest.php
#	translations/messages.fr.yaml
#	webpack.config.js
#	yarn.lock