fixed merge conflicts
Showing
- .gitlab-ci.yml 2 additions, 2 deletions.gitlab-ci.yml
- proposals/Assets/Figure1.png 0 additions, 0 deletionsproposals/Assets/Figure1.png
- proposals/Assets/Figure2.png 0 additions, 0 deletionsproposals/Assets/Figure2.png
- proposals/Assets/Figure3.png 0 additions, 0 deletionsproposals/Assets/Figure3.png
- proposals/Assets/Figure4.png 0 additions, 0 deletionsproposals/Assets/Figure4.png
- proposals/Assets/Figure5.png 0 additions, 0 deletionsproposals/Assets/Figure5.png
- proposals/Assets/Figure6.png 0 additions, 0 deletionsproposals/Assets/Figure6.png
- proposals/commercial_detection_and_replacement.rst 598 additions, 0 deletionsproposals/commercial_detection_and_replacement.rst
- proposals/himanshuk.rst 399 additions, 0 deletionsproposals/himanshuk.rst
- proposals/images_support/BeaeglV-fire_gateware.png 0 additions, 0 deletionsproposals/images_support/BeaeglV-fire_gateware.png
- proposals/images_support/Device_tree.png 0 additions, 0 deletionsproposals/images_support/Device_tree.png
- proposals/index.rst 3 additions, 2 deletionsproposals/index.rst
- proposals/melta101.rst 420 additions, 0 deletionsproposals/melta101.rst
- proposals/melta101_static/RPMSG.png 0 additions, 0 deletionsproposals/melta101_static/RPMSG.png
- proposals/melta101_static/TI-SCI.png 0 additions, 0 deletionsproposals/melta101_static/TI-SCI.png
- proposals/melta101_static/Test_OpenAMP.png 0 additions, 0 deletionsproposals/melta101_static/Test_OpenAMP.png
- proposals/melta101_static/systemarch.png 0 additions, 0 deletionsproposals/melta101_static/systemarch.png
- proposals/template.rst 1 addition, 1 deletionproposals/template.rst
Please register or sign in to comment