From dc61eab5251234f02c0377ea328b929340b3604c Mon Sep 17 00:00:00 2001
From: saurabhb17
Date: Wed, 11 Mar 2020 14:59:48 +0530
Subject: cleanup part2

---
 Examples/BJT_CE_config/BJT_CE_config.pro | 9 +++++++++
 1 file changed, 9 insertions(+)

(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 64472dee..178e112d 100644
--- a/Examples/BJT_CE_config/BJT_CE_config.pro
+++ b/Examples/BJT_CE_config/BJT_CE_config.pro
@@ -61,6 +61,7 @@ LibName27=opto
 LibName28=atmel
 LibName29=contrib
 LibName30=power
+<<<<<<< HEAD
 LibName31=device
 LibName32=transistors
 LibName33=conn
@@ -69,3 +70,11 @@ 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