Commit 15942e18 authored by Yuanxiang PAN's avatar Yuanxiang PAN

conflict test

parent 2d5bf7d9
......@@ -6269,7 +6269,7 @@
(pin input line
(at 41.91 -30.48 180)
(length 2.54)
(name "CONFIG_X"
(name "CONFIG_Z"
(effects
(font
(size 1.27 1.27)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment