chore: cleanup for merging/ switching to later branches

2025-10-30 17:07:20 +01:00
parent 8990af88fb
commit 4688a8fe17
5 changed files with 0 additions and 289 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,5 @@
 pyzmq<16
-<<<<<<< HEAD
-pyaudio<=0.2.11
-=======
 pyaudio<=0.2.11
 pytest<5
 pytest-mock<3.0.0
 pytest-cov<3.0.0
->>>>>>> origin/dev