Update quick-start/build-open-harmony.rst

quick-start/build-open-harmony.rst

@@ -53,37 +53,20 @@ Once git-repo has been installed, you can clone the necessary repositories.
 
 If you are a user and wants to build your product on top of OHOS, then clone the ‘stable’ branch by executing the following commands:
 
-<<<<<<< HEAD
  .. code-block:: console
  
       $ mkdir ohos; cd ohos
       $ repo init -u https://git.ostc-eu.org/OSTC/manifest.git -b stable
       $ repo sync --no-clone-bundle
-=======
-.. code-block:: console
-
-   $ mkdir ohos; cd ohos
-   $ repo init -u https://git.ostc-eu.org/OSTC/manifest.git -b stable
-   $ repo sync
->>>>>>> afb820a (Update build-open-harmony.rst for Issues #19)
-
 **For OHOS Developer**
 
 If you are a developer and wants to contribute to OHOS, then clone the ‘develop’ branch by executing the following commands:
 
-<<<<<<< HEAD
  .. code-block:: console
  
       $ mkdir ohos; cd ohos
       $ repo init -u https://git.ostc-eu.org/OSTC/manifest.git -b develop -m develop.xml
       $ repo sync
-=======
-.. code-block:: console
-
-   $ mkdir ohos; cd ohos
-   $ repo init -u https://git.ostc-eu.org/OSTC/manifest.git -b develop
-   $ repo sync
->>>>>>> afb820a (Update build-open-harmony.rst for Issues #19)
 
 The preceding commands creates the following directory structure (layers):