diff options
Diffstat (limited to 'Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib')
-rw-r--r-- | Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib b/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib index e21eb0f8..81e6945f 100644 --- a/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib +++ b/Examples/Analysis_Of_Digital_IC/BCDToDecimalDecoder/BCDToDecimalDecoder-cache.lib @@ -29,11 +29,19 @@ 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 |