diff options
| author | saurabhb17 | 2020-03-18 20:22:53 +0530 |
|---|---|---|
| committer | GitHub | 2020-03-18 20:22:53 +0530 |
| commit | d3395f5bd22cdd99c7bfa41e5efaf3abf9690bf0 (patch) | |
| tree | affe4c16134e0ca17f6678707a602e06970beade /Examples/BJT_CE_config | |
| parent | d536a4002d05233971a08bbae1907ed9e24e3000 (diff) | |
| parent | 7d7964e7c677244e0fd9fd048a116f62553016ce (diff) | |
| download | eSim-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_CE_config')
| -rw-r--r-- | Examples/BJT_CE_config/BJT_CE_config.pro | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Examples/BJT_CE_config/BJT_CE_config.pro b/Examples/BJT_CE_config/BJT_CE_config.pro index 178e112d..c48b80e6 100644 --- a/Examples/BJT_CE_config/BJT_CE_config.pro +++ b/Examples/BJT_CE_config/BJT_CE_config.pro @@ -61,20 +61,3 @@ LibName27=opto LibName28=atmel
LibName29=contrib
LibName30=power
-<<<<<<< HEAD -LibName31=device
-LibName32=transistors
-LibName33=conn
-LibName34=linear
-LibName35=regul
-LibName36=74xx
-LibName37=cmos4000
-LibName38=eSim_Plot
-======= -LibName31=eSim_Plot
-LibName32=transistors
-LibName33=conn
-LibName34=cmos4000
-LibName35=regul
-LibName36=74xx
->>>>>>> fellowship2019-python3 |