fixes in Analysis of Digital ICs directory

3 files changed, 1 insertions, 96 deletions

diff --git a/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics-cache.lib b/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics-cache.lib
index b26d4bdf..b3066f61 100644
--- a/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics-cache.lib
+++ b/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics-cache.lib
@@ -27,19 +27,11 @@ X VDD 14 550 300 200 L 50 50 1 1 I
 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-4_Input_NAND_Charcateristics
 #
 DEF DC-RESCUE-4_Input_NAND_Charcateristics v 0 40 Y Y 1 F N
 F0 "v" -200 100 60 H V C CNN
 F1 "DC-RESCUE-4_Input_NAND_Charcateristics" -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/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics.pro b/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics.pro
index cacee8d6..f614a5d4 100644
--- a/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics.pro
+++ b/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics.pro
@@ -1,51 +1,4 @@
-<<<<<<< HEAD
-update=06/01/19 15:09:21

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

-LibName10=eSim_Sources

-LibName11=eSim_User

-LibName12=eSim_Subckt

-=======
-update=Wed Mar 11 12:52:26 2020
+update=Wed Mar 18 18:09:45 2020
 version=1
 last_client=eeschema
 [general]
@@ -90,4 +43,3 @@ LibName9=eSim_Power
 LibName10=eSim_Subckt
 LibName11=eSim_Sources
 LibName12=eSim_User
->>>>>>> fellowship2019-python3
diff --git a/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics.sch b/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics.sch
index 40e78f30..5d230393 100644
--- a/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics.sch
+++ b/Examples/Analysis_Of_Digital_IC/4_Input_NAND_Charcateristics/4_Input_NAND_Charcateristics.sch
@@ -1,8 +1,5 @@
 EESchema Schematic File Version 2
-<<<<<<< HEAD
-=======
 LIBS:4_Input_NAND_Charcateristics-rescue
->>>>>>> fellowship2019-python3
 LIBS:power
 LIBS:eSim_Analog
 LIBS:eSim_Devices
@@ -11,10 +8,6 @@ LIBS:eSim_Hybrid
 LIBS:eSim_Miscellaneous
 LIBS:eSim_Plot
 LIBS:eSim_Power
-<<<<<<< HEAD
-LIBS:eSim_PSpice
-=======
->>>>>>> fellowship2019-python3
 LIBS:eSim_Sources
 LIBS:eSim_User
 LIBS:eSim_Subckt
@@ -58,11 +51,7 @@ $EndComp
 NoConn ~ 4550 4350
 NoConn ~ 5600 3750
 $Comp
-<<<<<<< HEAD
-L DC v1
-=======
 L DC-RESCUE-4_Input_NAND_Charcateristics v1
->>>>>>> fellowship2019-python3
 U 1 1 5CF2488C
 P 1900 3450
 F 0 "v1" H 1700 3550 60  0000 C CNN
@@ -73,11 +62,7 @@ F 3 "" H 1900 3450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v2
-=======
 L DC-RESCUE-4_Input_NAND_Charcateristics v2
->>>>>>> fellowship2019-python3
 U 1 1 5CF248E2
 P 1900 4000
 F 0 "v2" H 1700 4100 60  0000 C CNN
@@ -88,11 +73,7 @@ F 3 "" H 1900 4000 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v3
-=======
 L DC-RESCUE-4_Input_NAND_Charcateristics v3
->>>>>>> fellowship2019-python3
 U 1 1 5CF24906
 P 1900 4550
 F 0 "v3" H 1700 4650 60  0000 C CNN
@@ -103,11 +84,7 @@ F 3 "" H 1900 4550 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v4
-=======
 L DC-RESCUE-4_Input_NAND_Charcateristics v4
->>>>>>> fellowship2019-python3
 U 1 1 5CF24935
 P 1900 5100
 F 0 "v4" H 1700 5200 60  0000 C CNN
@@ -161,11 +138,7 @@ F 3 "" H 6450 4050 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v8
-=======
 L DC-RESCUE-4_Input_NAND_Charcateristics v8
->>>>>>> fellowship2019-python3
 U 1 1 5CF24B50
 P 8150 4650
 F 0 "v8" H 7950 4750 60  0000 C CNN
@@ -176,11 +149,7 @@ F 3 "" H 8150 4650 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v7
-=======
 L DC-RESCUE-4_Input_NAND_Charcateristics v7
->>>>>>> fellowship2019-python3
 U 1 1 5CF24B56
 P 8150 4100
 F 0 "v7" H 7950 4200 60  0000 C CNN
@@ -191,11 +160,7 @@ F 3 "" H 8150 4100 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v6
-=======
 L DC-RESCUE-4_Input_NAND_Charcateristics v6
->>>>>>> fellowship2019-python3
 U 1 1 5CF24B5C
 P 8150 3550
 F 0 "v6" H 7950 3650 60  0000 C CNN
@@ -206,11 +171,7 @@ F 3 "" H 8150 3550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-<<<<<<< HEAD
-L DC v5
-=======
 L DC-RESCUE-4_Input_NAND_Charcateristics v5
->>>>>>> fellowship2019-python3
 U 1 1 5CF24B62
 P 8150 3000
 F 0 "v5" H 7950 3100 60  0000 C CNN