Commit 5ca70e79 authored by hardy's avatar hardy

typo fix

parent 63156281
......@@ -38,10 +38,6 @@ import os
import time
from multiprocessing import Process, Lock, SimpleQueue
import yaml
<<<<<<< HEAD
=======
>>>>>>> 90c6b8b58b... copyout workaround
#-----------------------------------------------------------
# OAI Testing modules
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment