diff options
| author | saurabhb17 | 2020-03-18 20:22:53 +0530 |
|---|---|---|
| committer | GitHub | 2020-03-18 20:22:53 +0530 |
| commit | d3395f5bd22cdd99c7bfa41e5efaf3abf9690bf0 (patch) | |
| tree | affe4c16134e0ca17f6678707a602e06970beade /Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.sch | |
| parent | d536a4002d05233971a08bbae1907ed9e24e3000 (diff) | |
| parent | 7d7964e7c677244e0fd9fd048a116f62553016ce (diff) | |
| download | eSim-d3395f5bd22cdd99c7bfa41e5efaf3abf9690bf0.tar.gz eSim-d3395f5bd22cdd99c7bfa41e5efaf3abf9690bf0.tar.bz2 eSim-d3395f5bd22cdd99c7bfa41e5efaf3abf9690bf0.zip | |
Merge pull request #140 from saurabhb17/master
Changes in .pro across Examples and Subcircuits
Diffstat (limited to 'Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.sch')
| -rw-r--r-- | Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder.sch | 19 |
1 files changed, 0 insertions, 19 deletions
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 |