summaryrefslogtreecommitdiff
path: root/Examples/Analysis_Of_Digital_IC/4073_test/4073_test.pro
diff options
context:
space:
mode:
Diffstat (limited to 'Examples/Analysis_Of_Digital_IC/4073_test/4073_test.pro')
-rw-r--r--Examples/Analysis_Of_Digital_IC/4073_test/4073_test.pro6
1 files changed, 6 insertions, 0 deletions
diff --git a/Examples/Analysis_Of_Digital_IC/4073_test/4073_test.pro b/Examples/Analysis_Of_Digital_IC/4073_test/4073_test.pro
index 1ff3178b..a356f8bb 100644
--- a/Examples/Analysis_Of_Digital_IC/4073_test/4073_test.pro
+++ b/Examples/Analysis_Of_Digital_IC/4073_test/4073_test.pro
@@ -40,7 +40,13 @@ LibName6=eSim_Hybrid
LibName7=eSim_Miscellaneous
LibName8=eSim_Plot
LibName9=eSim_Power
+<<<<<<< HEAD
LibName10=eSim_PSpice
LibName11=eSim_Sources
LibName12=eSim_Subckt
LibName13=eSim_User
+=======
+LibName10=eSim_User
+LibName11=eSim_Sources
+LibName12=eSim_Subckt
+>>>>>>> fellowship2019-python3