resolve merge conflict

7 years ago · 7cd2e904a5
parent 87095ae784 0bdbc3e0b3
commit 7cd2e904a5
2 changed files with 3 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -145,3 +145,4 @@ Test the prototype.
    [ ] reverse D9 at US2 to draw power from usb instead of provide it
    [ ] micro USB extended pads for Handsoldering
    [ ] schem gpio pins rename to gp/gn for easier readability
    [ ] Make BOM outputtable from PCB->Files->Fabrication Outputs->BOM file
--- a/doc/bom-generator.txt
+++ b/doc/bom-generator.txt
@ -0,0 +1,2 @@
 try this
 https://github.com/SchrodingersGat/KiBoM
		`@ -0,0 +1,2 @@`
							`try this`
							`https://github.com/SchrodingersGat/KiBoM`