From e09143dce373b34aca692504ac60003a1e7a9b46 Mon Sep 17 00:00:00 2001
From: saurabhb17
Date: Wed, 18 Mar 2020 18:39:30 +0530
Subject: BJT examples' .pro fixed

---
 Examples/BJT_CE_config/BJT_CE_config.pro | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'Examples/BJT_CE_config')

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
-- 
cgit