Correct merge conflict

chinyeungli · chinyeungli · commit cfb194ddc578 · 2022-02-25T14:52:23.000+08:00
Signed-off-by: Chin Yeung Li &lt;tli@nexb.com&gt;
diff --git a/setup.cfg b/setup.cfg
@@ -63,13 +63,10 @@ where=src
 testing =
     pytest >= 6, != 7.0.0
     pytest-xdist >= 2
-<<<<<<< HEAD
     mock
     colorama
     py
-=======
     black
->>>>>>> refs/remotes/skeleton/main
 docs=
     Sphinx>=3.3.1
     sphinx-rtd-theme>=0.5.0
