summaryrefslogtreecommitdiff
path: root/Examples/BJT_CB_config/BJT_CB_config.pro
diff options
context:
space:
mode:
authorsaurabhb172020-03-18 20:22:53 +0530
committerGitHub2020-03-18 20:22:53 +0530
commitd3395f5bd22cdd99c7bfa41e5efaf3abf9690bf0 (patch)
treeaffe4c16134e0ca17f6678707a602e06970beade /Examples/BJT_CB_config/BJT_CB_config.pro
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_CB_config/BJT_CB_config.pro')
-rw-r--r--Examples/BJT_CB_config/BJT_CB_config.pro15
1 files changed, 0 insertions, 15 deletions
diff --git a/Examples/BJT_CB_config/BJT_CB_config.pro b/Examples/BJT_CB_config/BJT_CB_config.pro
index 42e7b22f..109f0cc7 100644
--- a/Examples/BJT_CB_config/BJT_CB_config.pro
+++ b/Examples/BJT_CB_config/BJT_CB_config.pro
@@ -63,18 +63,3 @@ LibName29=opto
LibName30=atmel
LibName31=contrib
LibName32=power
-<<<<<<< HEAD
-LibName33=device
-LibName34=transistors
-LibName35=conn
-LibName36=linear
-LibName37=regul
-LibName38=74xx
-LibName39=cmos4000
-=======
-LibName33=74xx
-LibName34=transistors
-LibName35=conn
-LibName36=cmos4000
-LibName37=regul
->>>>>>> fellowship2019-python3