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(-)

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