summaryrefslogtreecommitdiff
path: root/Examples/BJT_Biascircuit
diff options
context:
space:
mode:
authorsaurabhb172020-03-11 15:02:18 +0530
committerGitHub2020-03-11 15:02:18 +0530
commit113b43f1cdf83b64ab7faf3fc9cea0181740ad50 (patch)
treef1bf080150f8e19788b2dc56eeb10021a44b2c2f /Examples/BJT_Biascircuit
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_Biascircuit')
-rw-r--r--Examples/BJT_Biascircuit/BJT_Biascircuit.pro9
1 files changed, 9 insertions, 0 deletions
diff --git a/Examples/BJT_Biascircuit/BJT_Biascircuit.pro b/Examples/BJT_Biascircuit/BJT_Biascircuit.pro
index 8da3fa54..f449ea48 100644
--- a/Examples/BJT_Biascircuit/BJT_Biascircuit.pro
+++ b/Examples/BJT_Biascircuit/BJT_Biascircuit.pro
@@ -62,6 +62,7 @@ LibName28=opto
LibName29=atmel
LibName30=contrib
LibName31=power
+<<<<<<< HEAD
LibName32=device
LibName33=transistors
LibName34=conn
@@ -70,3 +71,11 @@ LibName36=regul
LibName37=74xx
LibName38=cmos4000
LibName39=/home/fossee/library/eSim_Plot
+=======
+LibName32=eSim_Plot
+LibName33=transistors
+LibName34=conn
+LibName35=74xx
+LibName36=regul
+
+>>>>>>> fellowship2019-python3