Signed-off-by: fhx <fanfhx@163.com>
Merge branch 'mst_zp' of https://github.com/zpcaams/nir_usb into master_fhx
Merge branch 'master_fhx' of https://github.com/zpcaams/nir_usb into mst_fhx
Signed-off-by: fhx <fanfhx@163.com>
尝试一下提交命令

Signed-off-by: fhx <fanfhx@163.com>
添加需要使用的物料信息
Merge branch 'mst_zp' into mst_fhx

Conflicts:
	pcb/nir_usb.SchLib

Signed-off-by: fhx <fanfhx@163.com>