diff options
Diffstat (limited to 'Examples/BJT_CB_config/BJT_CB_config.pro')
| -rw-r--r-- | Examples/BJT_CB_config/BJT_CB_config.pro | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Examples/BJT_CB_config/BJT_CB_config.pro b/Examples/BJT_CB_config/BJT_CB_config.pro index 4bb665c8..42e7b22f 100644 --- a/Examples/BJT_CB_config/BJT_CB_config.pro +++ b/Examples/BJT_CB_config/BJT_CB_config.pro @@ -63,6 +63,7 @@ LibName29=opto LibName30=atmel LibName31=contrib LibName32=power +<<<<<<< HEAD LibName33=device LibName34=transistors LibName35=conn @@ -70,3 +71,10 @@ LibName36=linear LibName37=regul LibName38=74xx LibName39=cmos4000 +======= +LibName33=74xx +LibName34=transistors +LibName35=conn +LibName36=cmos4000 +LibName37=regul +>>>>>>> fellowship2019-python3 |