# Conflicts:
#	CHANGELOG.md
#	CONTRIBUTING.md
#	packages/connect/src/Accueil.dir/Vue serveur.dir/Flux Inter-SYNTHESE
#	packages/connect/src/Accueil.dir/Vue serveur.dir/Systèmes clients
#	packages/lib/src/metadata.json
#	packages/terminus/src/metadata.json
#	server/src/00_framework/Object.hpp
#	server/src/00_framework/ObjectBase.hpp
#	server/src/00_framework/PointerField2.hpp
#	server/src/01_util/Env.cpp
#	server/src/01_util/Env.h
#	server/src/01_util/Registrable.h
#	server/src/11_cms/ForEachExpression.cpp
#	server/src/11_cms/PackagesService.cpp
#	server/src/17_messages/AlarmObjectLink.h
#	server/src/17_messages/ScenariosListFunction.cpp
#	server/src/18_graph/ServicePointer.cpp
#	server/src/19_inter_synthese/InterSYNTHESEPackageContent.cpp
#	server/src/19_inter_synthese/InterSYNTHESEPackageContent.hpp
#	server/src/19_inter_synthese/InterSYNTHESEPackageFileFormat.cpp
#	server/src/31_calendar/BaseCalendarUpdateAction.cpp
#	server/src/31_calendar/CalendarLink.cpp
#	server/src/31_calendar/CalendarLink.hpp
#	server/src/31_calendar/CalendarLinkUpdateAction.cpp
#	server/src/31_calendar/CalendarTemplate.cpp
#	server/src/31_calendar/CalendarTemplate.h
#	server/src/31_calendar/CalendarTemplateElement.cpp
#	server/src/31_calendar/CalendarTemplateElement.h
#	server/src/31_calendar/CalendarTemplateElementAddAction.cpp
#	server/src/31_calendar/CalendarTemplateElementTableSync.h
#	server/src/31_calendar/CalendarTemplatePropertiesUpdateAction.cpp
#	server/src/32_geography/MapSource.cpp
#	server/src/32_geography/NamedPlaceField.cpp
#	server/src/32_geography/PlaceAlias.h
#	server/src/34_road/Road.h
#	server/src/34_road/RoadChunk.cpp
#	server/src/35_pt/ServiceAddAction.cpp
#	server/src/36_access/AccessCondition.hpp
#	server/src/38_vehicle/VehiclePosition.hpp
#	server/src/51_resa/ReservationTransaction.h
#	server/src/55_timetables/TimetableRow.h
#	server/src/56_pt_website/RollingStockFilter.h
#	server/src/61_data_exchange/TridentFileFormat.cpp
#	server/src/63_settings/SettingsTableSync.cpp
#	server/src/64_multimodal_journey_planner/MultimodalJourneyPlannerService.cpp
#	server/test/01_util/iostreams/CMakeLists.txt
#	server/test/01_util/threads/CMakeLists.txt
#	server/test/10_db/NewDBRegistryTableSyncTest.cpp
#	server/test/10_db/NewTestTableSync.hpp
#	server/test/31_calendar/CalendarTest.cpp
#	server/test/55_timetables/TimetablesTest.cpp
#	server/test/common/TestUtils.hpp