Resolved merge conflict

This commit is contained in:
DerekGn 2017-03-05 15:29:01 +00:00
parent 0dabf7c6aa
commit 9a07d944af

View file

@ -10995,10 +10995,10 @@ ENDDEF
#
# AVR-PDI-6
#
DEF AVR-PDI-6 CON 0 40 Y Y 1 F N
DEF AVR-PUDI-6 CON 0 40 Y Y 1 F N
F0 "CON" -80 240 50 H V C CNN
F1 "AVR-PDI-6" -210 -245 50 H V L BNN
F2 "AVR-PDI-6" -445 35 50 V I C CNN
F1 "AVR-PUDI-6" -210 -245 50 H V L BNN
F2 "AVR-PUDI-6" -445 35 50 V I C CNN
F3 "" 0 0 50 H I C CNN
DRAW
T 0 -350 0 45 0 0 0 NC Normal 1 C C