Merge branch 'develop' into danturin
This commit is contained in:
commit
b73129aa38
|
|
@ -1,6 +1,8 @@
|
|||
/target
|
||||
/.idea
|
||||
*.iml
|
||||
/bin.py
|
||||
python/dontlook.py
|
||||
expected_values.md
|
||||
/bin.py
|
||||
python/dontlook.py
|
||||
|
|
|
|||
|
|
@ -5,5 +5,9 @@ pytest-cov==3.0.0
|
|||
mypy==0.941
|
||||
dearpygui==1.8.0
|
||||
PyYAML==6.0
|
||||
<<<<<<< HEAD
|
||||
rich==13.3.1
|
||||
pyinstaller==5.8.0
|
||||
pyinstaller==5.8.0
|
||||
=======
|
||||
rich==13.3.1
|
||||
>>>>>>> develop
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 248 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 352 KiB |
Reference in New Issue