summaryrefslogtreecommitdiff
path: root/Examples/BJT_Biascircuit
diff options
context:
space:
mode:
authorsaurabhb172020-03-18 20:22:53 +0530
committerGitHub2020-03-18 20:22:53 +0530
commitd3395f5bd22cdd99c7bfa41e5efaf3abf9690bf0 (patch)
treeaffe4c16134e0ca17f6678707a602e06970beade /Examples/BJT_Biascircuit
parentd536a4002d05233971a08bbae1907ed9e24e3000 (diff)
parent7d7964e7c677244e0fd9fd048a116f62553016ce (diff)
downloadeSim-d3395f5bd22cdd99c7bfa41e5efaf3abf9690bf0.tar.gz
eSim-d3395f5bd22cdd99c7bfa41e5efaf3abf9690bf0.tar.bz2
eSim-d3395f5bd22cdd99c7bfa41e5efaf3abf9690bf0.zip
Merge pull request #140 from saurabhb17/master
Changes in .pro across Examples and Subcircuits
Diffstat (limited to 'Examples/BJT_Biascircuit')
-rw-r--r--Examples/BJT_Biascircuit/BJT_Biascircuit.pro17
1 files changed, 0 insertions, 17 deletions
diff --git a/Examples/BJT_Biascircuit/BJT_Biascircuit.pro b/Examples/BJT_Biascircuit/BJT_Biascircuit.pro
index f449ea48..6b3635f5 100644
--- a/Examples/BJT_Biascircuit/BJT_Biascircuit.pro
+++ b/Examples/BJT_Biascircuit/BJT_Biascircuit.pro
@@ -62,20 +62,3 @@ LibName28=opto
LibName29=atmel
LibName30=contrib
LibName31=power
-<<<<<<< HEAD
-LibName32=device
-LibName33=transistors
-LibName34=conn
-LibName35=linear
-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