From 746508e0dfd61e039260584a235fe4a01216873a Mon Sep 17 00:00:00 2001
From: saurabhb17
Date: Thu, 19 Mar 2020 17:45:39 +0530
Subject: minor

---
 Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'Examples')

diff --git a/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out b/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
index 7f123137..2855fc60 100644
--- a/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
+++ b/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
@@ -1,12 +1,8 @@
 * /home/saurabh/installer_main_workshop/esim-1.1.2/examples/bjt_frequency_response/bjt_frequency_response.cir
-
 .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
-- 
cgit 


From ff4f0441babff216ce7fb9e5bf94a3ccf7a00331 Mon Sep 17 00:00:00 2001
From: saurabhb17
Date: Thu, 19 Mar 2020 17:57:52 +0530
Subject: minor

---
 Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out          | 2 +-
 .../BJT_Frequency_Response/BJT_Frequency_Response_Previous_Values.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Examples')

diff --git a/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out b/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
index 2855fc60..4be2d69b 100644
--- a/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
+++ b/Examples/BJT_Frequency_Response/BJT_Frequency_Response.cir.out
@@ -1,7 +1,7 @@
 * /home/saurabh/installer_main_workshop/esim-1.1.2/examples/bjt_frequency_response/bjt_frequency_response.cir
+
 .include NPN.lib
 v1 net-_r2-pad2_ gnd  dc 10
-v2 in gnd  sine( 0.5 5 50 0 0)
 v2 in gnd  ac 0.5 0
 c1  net-_c1-pad1_ net-_c1-pad2_ 40u
 c2  gnd net-_c2-pad2_ 100u
diff --git a/Examples/BJT_Frequency_Response/BJT_Frequency_Response_Previous_Values.xml b/Examples/BJT_Frequency_Response/BJT_Frequency_Response_Previous_Values.xml
index bb3f891e..215f5b85 100644
--- a/Examples/BJT_Frequency_Response/BJT_Frequency_Response_Previous_Values.xml
+++ b/Examples/BJT_Frequency_Response/BJT_Frequency_Response_Previous_Values.xml
@@ -1 +1 @@
-<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">10</field1></v1><v2 name="Source type">ac<field1 name="Amplitude">0.5</field1><field2 name="Phase" /></v2></source><model /><devicemodel><q1><field>/home/saurabh/Downloads/eSim-1.1.2/src/deviceModelLibrary/Transistor/NPN.lib</field></q1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">false</field1><field2 name="Dec">true</field2><field3 name="Oct">false</field3><field4 name="Start Frequency">10</field4><field5 name="Stop Frequency">100</field5><field6 name="No. of points">100</field6><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Meg</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
+<KicadtoNgspice><source><v1 name="Source type">dc<field1 name="Value">10</field1></v1><v2 name="Source type">ac<field1 name="Amplitude">0.5</field1><field2 name="Phase" /></v2></source><model /><devicemodel><q1><field>/home/saurabh/Desktop/eSim-2.0/library/deviceModelLibrary/Transistor/NPN.lib</field></q1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">false</field1><field2 name="Dec">true</field2><field3 name="Oct">false</field3><field4 name="Start Frequency">10</field4><field5 name="Stop Frequency">100</field5><field6 name="No. of points">100</field6><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Meg</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
-- 
cgit