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