Fixing merge conflicts
Showing
- VERSION 0 additions, 5 deletionsVERSION
- _templates/layout.html 79 additions, 32 deletions_templates/layout.html
- _templates/message.html 1 addition, 1 deletion_templates/message.html
- _templates/oshw.html 1 addition, 1 deletion_templates/oshw.html
- _templates/todo.html 49 additions, 0 deletions_templates/todo.html
- boards/beaglebone/ai-64/01-introduction.rst 161 additions, 162 deletionsboards/beaglebone/ai-64/01-introduction.rst
- boards/beaglebone/ai-64/02-quick-start.rst 3 additions, 3 deletionsboards/beaglebone/ai-64/02-quick-start.rst
- boards/beaglebone/ai-64/04-expansion.rst 3 additions, 3 deletionsboards/beaglebone/ai-64/04-expansion.rst
- boards/beaglebone/ai/02-quick-start.rst 28 additions, 34 deletionsboards/beaglebone/ai/02-quick-start.rst
- boards/beagleconnect/freedom/05-demos.rst 18 additions, 5 deletionsboards/beagleconnect/freedom/05-demos.rst
- boards/beagleconnect/freedom/demos-and-tutorials/images/BeagleConnectFreedom-Back-Annotated-Arduino-Pinout.png 0 additions, 0 deletions...es/BeagleConnectFreedom-Back-Annotated-Arduino-Pinout.png
- boards/beagleconnect/freedom/demos-and-tutorials/images/BeagleConnectFreedom-Front-Annotated-Arduino-Pinout.png 0 additions, 0 deletions...s/BeagleConnectFreedom-Front-Annotated-Arduino-Pinout.png
- boards/beagleconnect/freedom/demos-and-tutorials/using-arduino-zephyr-template.rst 200 additions, 0 deletions...dom/demos-and-tutorials/using-arduino-zephyr-template.rst
- boards/beagleconnect/freedom/index.rst 0 additions, 2 deletionsboards/beagleconnect/freedom/index.rst
- boards/beagleplay/01-introduction.rst 3 additions, 3 deletionsboards/beagleplay/01-introduction.rst
- boards/beagleplay/02-quick-start.rst 24 additions, 3 deletionsboards/beagleplay/02-quick-start.rst
- boards/beagleplay/03-design.rst 34 additions, 34 deletionsboards/beagleplay/03-design.rst
- boards/beagleplay/04-expansion.rst 0 additions, 2 deletionsboards/beagleplay/04-expansion.rst
- boards/beagleplay/05-demos.rst 2 additions, 2 deletionsboards/beagleplay/05-demos.rst
- boards/beagleplay/demos-and-tutorials/beagleplay-kernel-development.rst 2 additions, 2 deletions...lay/demos-and-tutorials/beagleplay-kernel-development.rst
Please register or sign in to comment