summaryrefslogtreecommitdiff
path: root/Examples/BJT_CB_config
diff options
context:
space:
mode:
authorsaurabhb172020-03-11 14:59:48 +0530
committersaurabhb172020-03-11 14:59:48 +0530
commitdc61eab5251234f02c0377ea328b929340b3604c (patch)
treef1bf080150f8e19788b2dc56eeb10021a44b2c2f /Examples/BJT_CB_config
parent6ebbcc31ea0ce5c78c94718e2e46d87592c5d22b (diff)
downloadeSim-dc61eab5251234f02c0377ea328b929340b3604c.tar.gz
eSim-dc61eab5251234f02c0377ea328b929340b3604c.tar.bz2
eSim-dc61eab5251234f02c0377ea328b929340b3604c.zip
cleanup part2
Diffstat (limited to 'Examples/BJT_CB_config')
-rw-r--r--Examples/BJT_CB_config/BJT_CB_config.pro8
1 files changed, 8 insertions, 0 deletions
diff --git a/Examples/BJT_CB_config/BJT_CB_config.pro b/Examples/BJT_CB_config/BJT_CB_config.pro
index 4bb665c8..42e7b22f 100644
--- a/Examples/BJT_CB_config/BJT_CB_config.pro
+++ b/Examples/BJT_CB_config/BJT_CB_config.pro
@@ -63,6 +63,7 @@ LibName29=opto
LibName30=atmel
LibName31=contrib
LibName32=power
+<<<<<<< HEAD
LibName33=device
LibName34=transistors
LibName35=conn
@@ -70,3 +71,10 @@ LibName36=linear
LibName37=regul
LibName38=74xx
LibName39=cmos4000
+=======
+LibName33=74xx
+LibName34=transistors
+LibName35=conn
+LibName36=cmos4000
+LibName37=regul
+>>>>>>> fellowship2019-python3