typo fix

2021-10-13 16:12:06 +02:00
parent 4b03a4ad61
commit 65d64518db
1 changed files with 0 additions and 4 deletions
@@ -38,10 +38,6 @@ import os
 import time
 from multiprocessing import Process, Lock, SimpleQueue
 import yaml
-<<<<<<< HEAD
-
-=======
->>>>>>> 90c6b8b58b... copyout workaround

 #-----------------------------------------------------------
 # OAI Testing modules