fighting git conflicts

This commit is contained in:
apetitco 2025-12-19 15:16:02 +01:00
parent 8898d53526
commit 04c598bed3
11 changed files with 55 additions and 1321 deletions

6
.idea/vcs.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>