commit 969bebcb46d23b3e7eebd904fc2edbe2f9d01130
author Ali Imran <59641896+ALI11-2000@users.noreply.github.com> Tue Mar 22 04:42:55 2022 +0500
committer GitHub <noreply@github.com> Tue Mar 22 04:42:55 2022 +0500
tree fcaacf56aeed7475bf5cc8533c75c3c26f1031e2
parent ed78a8fa335e5a9d0e03506e79f6a264b3efe4dc

Update pin_order.cfg

openlane/Motor_Top/pin_order.cfg

diff --git a/openlane/Motor_Top/pin_order.cfg b/openlane/Motor_Top/pin_order.cfg
index 599dfc1..2765d55 100644
--- a/openlane/Motor_Top/pin_order.cfg
+++ b/openlane/Motor_Top/pin_order.cfg
@@ -1,41 +1,18 @@
 
 #BUS_SORT
 
-<<<<<<< HEAD
-
 #W
 io_wbs_m2s_.*
 io_ba_match
 
 #S
-
 io_qei_.*
 io_motor_irq
 
 #E
-
 io_pwm_high
 io_pwm_low
 
 #N
-
 clock
 reset
-
-=======
-#N
-clock
-reset
-
-#S
-io_motor_irq
-io_qei_.*
-
-#W
-io_ba_match
-io_wbs_m2s_.*
-
-#E
-io_pwm_high
-io_pwm_low
->>>>>>> 27b6ec77ec3dde0afc7ff348b67f90eadf18786a