Compare commits

...

2 Commits

Author SHA1 Message Date
Sascha Woitschetzki 0dbdfcd70d merge 2024-12-12 12:09:39 +07:00
Sascha Woitschetzki d6c9950471 laptop 2024-12-12 12:09:18 +07:00
2 changed files with 13 additions and 0 deletions

@ -1,9 +1,18 @@
<<<<<<< HEAD
# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/contentModel.xml
/.idea.project.iml
=======
# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/.idea.project.iml
/contentModel.xml
>>>>>>> 834f0845bdaea17d4d42487ed079c38e8df9fad9
/modules.xml
/projectSettingsUpdater.xml
# Editor-based HTTP Client requests

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>