Merge remote changes

This commit is contained in:
2025-02-17 22:42:42 +01:00
2 changed files with 7 additions and 0 deletions

4
.gitignore vendored
View File

@@ -159,3 +159,7 @@ cython_debug/
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
<<<<<<< HEAD
=======
>>>>>>> 638a19d39481855fcdac76f9c3ec23c860db016d