merge fixes

This commit is contained in:
Oliver 2016-04-12 21:20:33 +10:00
parent 3f3e19942f
commit b9498f8d11

View file

@ -1122,24 +1122,6 @@ X V+ 5 -100 300 150 D 50 50 1 1 I
ENDDRAW
ENDDEF
#
# MCP601R
#
DEF MCP601R U 0 20 Y Y 1 F N
F0 "U" 50 200 50 H V C CNN
F1 "MCP601R" 200 -200 50 H V C CNN
F2 "" -50 100 50 H V C CNN
F3 "" 50 200 50 H V C CNN
DRAW
P 4 0 1 10 -200 200 200 0 -200 -200 -200 200 f
>>>>>>> Temporary merge branch 2
X ~ 1 300 0 100 L 50 50 1 1 O
X V+ 2 -100 300 150 D 50 50 1 1 I
X + 3 -300 100 100 R 50 50 1 1 I
X - 4 -300 -100 100 R 50 50 1 1 I
X V- 5 -100 -300 150 U 50 50 1 1 I
ENDDRAW
ENDDEF
#
# OP275
#
DEF OP275 U 0 10 Y Y 2 F N