summaryrefslogtreecommitdiff
path: root/Examples/BJT_CB_config
diff options
context:
space:
mode:
Diffstat (limited to 'Examples/BJT_CB_config')
-rw-r--r--Examples/BJT_CB_config/BJT_CB_config.pro15
1 files changed, 0 insertions, 15 deletions
diff --git a/Examples/BJT_CB_config/BJT_CB_config.pro b/Examples/BJT_CB_config/BJT_CB_config.pro
index 42e7b22f..109f0cc7 100644
--- a/Examples/BJT_CB_config/BJT_CB_config.pro
+++ b/Examples/BJT_CB_config/BJT_CB_config.pro
@@ -63,18 +63,3 @@ LibName29=opto
LibName30=atmel
LibName31=contrib
LibName32=power
-<<<<<<< HEAD
-LibName33=device
-LibName34=transistors
-LibName35=conn
-LibName36=linear
-LibName37=regul
-LibName38=74xx
-LibName39=cmos4000
-=======
-LibName33=74xx
-LibName34=transistors
-LibName35=conn
-LibName36=cmos4000
-LibName37=regul
->>>>>>> fellowship2019-python3