fixed merge conflicts

3e54e1be · Saish Karole · d8960e95 · 5dd4806b · 3e54e1be · 3e54e1be
Commit 3e54e1be authored 11 months ago by Saish Karole
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+# The Docker image that will be used to build your app
 image: beagle/sphinx-build-env:latest
-
 pages:
  tags:
  - docker-amd64
@@ -7,4 +7,4 @@ pages:
  - "./gitlab-build.sh"
  artifacts:
    paths:
-    - public
\ No newline at end of file
+    - public
--- a/proposals/Assets/Figure1.png
+++ b/proposals/Assets/Figure1.png
--- a/proposals/Assets/Figure2.png
+++ b/proposals/Assets/Figure2.png
--- a/proposals/Assets/Figure3.png
+++ b/proposals/Assets/Figure3.png
--- a/proposals/Assets/Figure4.png
+++ b/proposals/Assets/Figure4.png
--- a/proposals/Assets/Figure5.png
+++ b/proposals/Assets/Figure5.png
--- a/proposals/Assets/Figure6.png
+++ b/proposals/Assets/Figure6.png
--- a/proposals/commercial_detection_and_replacement.rst
+++ b/proposals/commercial_detection_and_replacement.rst
--- a/proposals/himanshuk.rst
+++ b/proposals/himanshuk.rst
--- a/proposals/images_support/BeaeglV-fire_gateware.png
+++ b/proposals/images_support/BeaeglV-fire_gateware.png
--- a/proposals/images_support/Device_tree.png
+++ b/proposals/images_support/Device_tree.png
--- a/proposals/index.rst
+++ b/proposals/index.rst
-.. _proposals:
+.. _gsoc-proposal-Himanshu kohale:

-Proposals
 #########

 .. tip:: 
@@ -12,4 +11,6 @@ Proposals
    :hidden:

    template
+    melta101
    drone_cape_for_beagle-v-fire
+
--- a/proposals/melta101.rst
+++ b/proposals/melta101.rst
--- a/proposals/melta101_static/RPMSG.png
+++ b/proposals/melta101_static/RPMSG.png
--- a/proposals/melta101_static/TI-SCI.png
+++ b/proposals/melta101_static/TI-SCI.png
--- a/proposals/melta101_static/Test_OpenAMP.png
+++ b/proposals/melta101_static/Test_OpenAMP.png
--- a/proposals/melta101_static/systemarch.png
+++ b/proposals/melta101_static/systemarch.png
--- a/proposals/template.rst
+++ b/proposals/template.rst
@@ -189,7 +189,7 @@ Initial results (September 3)

    **November 11 - 18:00 UTC:** Final date for mentors to submit evaluations for GSoC contributor projects with extended deadline

-Experience and approch
+Experience and approach
 ***********************

 In 5-15 sentences, convince us you will be able to successfully complete your project in the timeline you have described.