summaryrefslogtreecommitdiff
path: root/Examples/BJT_amplifier/BJT_amplifier.pro
diff options
context:
space:
mode:
authorsaurabhb172020-03-11 15:02:18 +0530
committerGitHub2020-03-11 15:02:18 +0530
commit113b43f1cdf83b64ab7faf3fc9cea0181740ad50 (patch)
treef1bf080150f8e19788b2dc56eeb10021a44b2c2f /Examples/BJT_amplifier/BJT_amplifier.pro
parent6ebbcc31ea0ce5c78c94718e2e46d87592c5d22b (diff)
parentdc61eab5251234f02c0377ea328b929340b3604c (diff)
downloadeSim-113b43f1cdf83b64ab7faf3fc9cea0181740ad50.tar.gz
eSim-113b43f1cdf83b64ab7faf3fc9cea0181740ad50.tar.bz2
eSim-113b43f1cdf83b64ab7faf3fc9cea0181740ad50.zip
Merge pull request #134 from saurabhb17/master
cleanup part2
Diffstat (limited to 'Examples/BJT_amplifier/BJT_amplifier.pro')
-rw-r--r--Examples/BJT_amplifier/BJT_amplifier.pro7
1 files changed, 5 insertions, 2 deletions
diff --git a/Examples/BJT_amplifier/BJT_amplifier.pro b/Examples/BJT_amplifier/BJT_amplifier.pro
index 1baaf847..34286d46 100644
--- a/Examples/BJT_amplifier/BJT_amplifier.pro
+++ b/Examples/BJT_amplifier/BJT_amplifier.pro
@@ -16,10 +16,10 @@ LibName9=eSim_Sources
LibName10=eSim_Subckt
LibName11=eSim_User
LibName12=power
-LibName13=device
+LibName13=contrib
LibName14=transistors
LibName15=conn
-LibName16=linear
+LibName16=valves
LibName17=regul
LibName18=74xx
LibName19=cmos4000
@@ -42,5 +42,8 @@ LibName35=cypress
LibName36=siliconi
LibName37=opto
LibName38=atmel
+<<<<<<< HEAD
LibName39=contrib
LibName40=valves
+=======
+>>>>>>> fellowship2019-python3