summaryrefslogtreecommitdiff
path: root/Examples/BJT_CB_config/BJT_CB_config.pro
diff options
context:
space:
mode:
authorsaurabhb172020-03-18 18:39:30 +0530
committersaurabhb172020-03-18 18:39:30 +0530
commite09143dce373b34aca692504ac60003a1e7a9b46 (patch)
tree57b5dbcc2171ff9c8adeff94ab0f87791eb33555 /Examples/BJT_CB_config/BJT_CB_config.pro
parent327312696ea1b3f7cee80db4056ed99d8c33d7df (diff)
downloadeSim-e09143dce373b34aca692504ac60003a1e7a9b46.tar.gz
eSim-e09143dce373b34aca692504ac60003a1e7a9b46.tar.bz2
eSim-e09143dce373b34aca692504ac60003a1e7a9b46.zip
BJT examples' .pro fixed
Diffstat (limited to 'Examples/BJT_CB_config/BJT_CB_config.pro')
-rw-r--r--Examples/BJT_CB_config/BJT_CB_config.pro15
1 files changed, 0 insertions, 15 deletions
diff --git a/Examples/BJT_CB_config/BJT_CB_config.pro b/Examples/BJT_CB_config/BJT_CB_config.pro
index 42e7b22f..109f0cc7 100644
--- a/Examples/BJT_CB_config/BJT_CB_config.pro
+++ b/Examples/BJT_CB_config/BJT_CB_config.pro
@@ -63,18 +63,3 @@ LibName29=opto
LibName30=atmel
LibName31=contrib
LibName32=power
-<<<<<<< HEAD
-LibName33=device
-LibName34=transistors
-LibName35=conn
-LibName36=linear
-LibName37=regul
-LibName38=74xx
-LibName39=cmos4000
-=======
-LibName33=74xx
-LibName34=transistors
-LibName35=conn
-LibName36=cmos4000
-LibName37=regul
->>>>>>> fellowship2019-python3