forked from UNN/2026-rff_mp
fixed conflict
This commit is contained in:
parent
48d37c6f77
commit
17fc44d83e
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -6,6 +6,10 @@ __pycache__/
|
||||||
|
|
||||||
# C extensions
|
# C extensions
|
||||||
*.so
|
*.so
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> a50fd0b ([0])
|
||||||
.DS_Store
|
.DS_Store
|
||||||
# Distribution / packaging
|
# Distribution / packaging
|
||||||
.Python
|
.Python
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user