Closed tekwizz123 closed 10 years ago
There seems to be a merge conflict @tekwizz123 - please update your branch
Weird, this appears to a issue with the cygwin environment I had for Windows. I've moved the files over to a Linux VM and updated the git software to the latest version (previous version was outdated). Followed the guide github.com links for solving the issue and it appears to think that every is up to date however on github it seems like the issues are still not resolved.
Ok, going to close this commit and try again.
Ignore the Paragraph Positioning Correction commit, I don't know why that is still in there. It will not affect any of the files, it just seems to be included due to a change I tried to make to the navigation structure before @mubix fixed it.
The other two commits after that should be for the uac.md layout so that its correct and includes a few spelling changes etc. The Facedancer and GoodFET commit updates the links page so that it includes links to the project page, as well as the assembled version of the Facedancer 2.1 board and the GoodFET42 board.
Let me know what you think or if I need to correct anything.