fix missed conflict

murrayrm · murrayrm · commit 1072deaac8a8 · 2019-05-31T09:50:50.000-07:00
diff --git a/control/tests/xferfcn_test.py b/control/tests/xferfcn_test.py
@@ -11,12 +11,8 @@
     ss2tf
 from control.lti import evalfr
 from control.exception import slycot_check
-<<<<<<< HEAD
 from control.lti import isctime, isdtime
-=======
 from control.dtime import sample_system
-# from control.lti import isdtime
->>>>>>> master
 
 
 class TestXferFcn(unittest.TestCase):
