3 files changed, 12 insertions, 87 deletions
diff --git a/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib b/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib
index 81e6945f..29acff42 100644
--- a/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib
+++ b/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib
@@ -29,19 +29,11 @@ X Vdd 16 500 350 200 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-<<<<<<< HEAD
-# DC
-#
-DEF DC v 0 40 Y Y 1 F N
-F0 "v" -200 100 60 H V C CNN
-F1 "DC" -200 -50 60 H V C CNN
-=======
 # DC-RESCUE-BCDToDecimalDecoder
 #
 DEF DC-RESCUE-BCDToDecimalDecoder v 0 40 Y Y 1 F N
 F0 "v" -200 100 60 H V C CNN
 F1 "DC-RESCUE-BCDToDecimalDecoder" -200 -50 60 H V C CNN
->>>>>>> fellowship2019-python3
 F2 "R1" -300 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
diff --git a/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.pro b/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.pro
index 3a7a5a58..33b3cf61 100644
--- a/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.pro
+++ b/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.pro
@@ -1,50 +1,4 @@
-<<<<<<< HEAD
-update=06/01/19 16:07:13
-version=1
-last_client=eeschema
-[general]
-version=1
-RootSch=
-BoardNm=
-[pcbnew]
-version=1
-LastNetListRead=
-UseCmpFile=1
-PadDrill=0.600000000000
-PadDrillOvalY=0.600000000000
-PadSizeH=1.500000000000
-PadSizeV=1.500000000000
-PcbTextSizeV=1.500000000000
-PcbTextSizeH=1.500000000000
-PcbTextThickness=0.300000000000
-ModuleTextSizeV=1.000000000000
-ModuleTextSizeH=1.000000000000
-ModuleTextSizeThickness=0.150000000000
-SolderMaskClearance=0.000000000000
-SolderMaskMinWidth=0.000000000000
-DrawSegmentWidth=0.200000000000
-BoardOutlineThickness=0.100000000000
-ModuleOutlineThickness=0.150000000000
-[cvpcb]
-version=1
-NetIExt=net
-[eeschema]
-version=1
-LibDir=../../eSim/kicadSchematicLibrary
-[eeschema/libraries]
-LibName1=power
-LibName2=eSim_Analog
-LibName3=eSim_Devices
-LibName4=eSim_Digital
-LibName5=eSim_Hybrid
-LibName6=eSim_Miscellaneous
-LibName7=eSim_Plot
-LibName8=eSim_Power
-LibName9=eSim_Sources
-LibName10=eSim_Subckt
-LibName11=eSim_User
-=======
-update=Wed Mar 11 12:54:17 2020
+update=Wed Mar 18 18:24:51 2020
 version=1
 last_client=eeschema
 [general]
@@ -77,16 +31,14 @@ NetIExt=net
 version=1
 LibDir=../../eSim/kicadSchematicLibrary
 [eeschema/libraries]
-LibName1=BCDToDecimalDecoder-rescue
-LibName2=power
-LibName3=eSim_Analog
-LibName4=eSim_Devices
-LibName5=eSim_Digital
-LibName6=eSim_Hybrid
-LibName7=eSim_Miscellaneous
-LibName8=eSim_Plot
-LibName9=eSim_Power
-LibName10=eSim_Sources
-LibName11=eSim_Subckt
-LibName12=eSim_User
->>>>>>> fellowship2019-python3
+LibName1=power
+LibName2=eSim_Analog
+LibName3=eSim_Devices
+LibName4=eSim_Digital
+LibName5=eSim_Hybrid
+LibName6=eSim_Miscellaneous
+LibName7=eSim_Plot
+LibName8=eSim_Power
+LibName9=eSim_Sources
+LibName10=eSim_Subckt
+LibName11=eSim_User
diff --git a/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.sch b/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.sch
index 15ab433e..093956bb 100644
--- a/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.sch
+++ b/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.sch
@@ -1,8 +1,5 @@
 EESchema Schematic File Version 2
-<<<<<<< HEAD
-=======
 LIBS:BCDToDecimalDecoder-rescue
->>>>>>> fellowship2019-python3
 LIBS:power
 LIBS:eSim_Analog
 LIBS:eSim_Devices
@@ -74,11 +71,7 @@ F 3 "" H 3800 5050 60  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v2
-=======
 L DC-RESCUE-BCDToDecimalDecoder v2
->>>>>>> fellowship2019-python3
 U 1 1 5CF25946
 P 9400 3950
 F 0 "v2" H 9200 4050 60  0000 C CNN
@@ -89,11 +82,7 @@ F 3 "" H 9400 3950 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v1
-=======
 L DC-RESCUE-BCDToDecimalDecoder v1
->>>>>>> fellowship2019-python3
 U 1 1 5CF259A4
 P 9400 3400
 F 0 "v1" H 9200 3500 60  0000 C CNN
@@ -104,11 +93,7 @@ F 3 "" H 9400 3400 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v3
-=======
 L DC-RESCUE-BCDToDecimalDecoder v3
->>>>>>> fellowship2019-python3
 U 1 1 5CF259F8
 P 9400 4500
 F 0 "v3" H 9200 4600 60  0000 C CNN
@@ -119,11 +104,7 @@ F 3 "" H 9400 4500 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v4
-=======
 L DC-RESCUE-BCDToDecimalDecoder v4
->>>>>>> fellowship2019-python3
 U 1 1 5CF25A37
 P 9450 5000
 F 0 "v4" H 9250 5100 60  0000 C CNN