summaryrefslogtreecommitdiff
path: root/Examples/BJT_Frequency_Response
diff options
context:
space:
mode:
Diffstat (limited to 'Examples/BJT_Frequency_Response')
-rw-r--r--Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out4
-rw-r--r--Examples/BJT_Frequency_Response/BJT_Frequency_Response.pro6
2 files changed, 6 insertions, 4 deletions
diff --git a/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out b/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
index 4be2d69b..7f123137 100644
--- a/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
+++ b/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
@@ -2,7 +2,11 @@
.include NPN.lib
v1 net-_r2-pad2_ gnd dc 10
+<<<<<<< HEAD
+v2 in gnd sine( 0.5 5 50 0 0)
+=======
v2 in gnd ac 0.5 0
+>>>>>>> fellowship2019-python3
c1 net-_c1-pad1_ net-_c1-pad2_ 40u
c2 gnd net-_c2-pad2_ 100u
c3 out net-_c3-pad2_ 40u
diff --git a/Examples/BJT_Frequency_Response/BJT_Frequency_Response.pro b/Examples/BJT_Frequency_Response/BJT_Frequency_Response.pro
index afdcf2d3..188278d7 100644
--- a/Examples/BJT_Frequency_Response/BJT_Frequency_Response.pro
+++ b/Examples/BJT_Frequency_Response/BJT_Frequency_Response.pro
@@ -62,10 +62,8 @@ LibName28=opto
LibName29=atmel
LibName30=contrib
LibName31=power
-LibName32=device
+LibName32=74xx
LibName33=transistors
LibName34=conn
-LibName35=linear
+LibName35=cmos4000
LibName36=regul
-LibName37=74xx
-LibName38=cmos4000