fix merge conflict

petercorke · petercorke · commit c244cb56eb89 · 2021-09-13T12:31:45.000+10:00
diff --git a/roboticstoolbox/tools/__init__.py b/roboticstoolbox/tools/__init__.py
@@ -1,18 +1,27 @@
 from roboticstoolbox.tools.null import null
-from roboticstoolbox.tools.p_servo import p_servo
+from roboticstoolbox.tools.p_servo import p_servo, p_servo_old
 from roboticstoolbox.tools.Ticker import Ticker
 from roboticstoolbox.tools.urdf import *  # noqa
-from roboticstoolbox.tools.trajectory import tpoly, tpoly_func, \
-    jtraj, mtraj, ctraj, lspb, lspb_func, qplot, mstraj
-from roboticstoolbox.tools.numerical import jacobian_numerical, \
-    hessian_numerical
+from roboticstoolbox.tools.trajectory import (
+    tpoly,
+    tpoly_func,
+    jtraj,
+    mtraj,
+    ctraj,
+    lspb,
+    lspb_func,
+    qplot,
+    mstraj,
+)
+from roboticstoolbox.tools.numerical import jacobian_numerical, hessian_numerical
 from roboticstoolbox.tools.jsingu import jsingu
 from roboticstoolbox.tools.data import rtb_load_data, rtb_load_matfile, rtb_load_jsonfile, rtb_path_to_datafile
 
 
 __all__ = [
     'null',
     'p_servo',
+    "p_servo_old",
     'Ticker',
     'tpoly',
     'tpoly_func',
