Fixed merge

Signed-off-by: Alejandro Hernández Cordero <[email protected]>

README.md

@@ -18,20 +18,12 @@ If you have already installed `gz-usd` you might want to visit [the tutorial sec
 # Requirements
 
 You will need all of the dependencies for sdformat, along with the following additional dependencies:
-<<<<<<< HEAD
-* [USD](https://github.com/PixarAnimationStudios/USD/tree/v21.11#getting-and-building-the-code):
-=======
-* [USD](https://github.com/PixarAnimationStudios/OpenUSD/tree/v24.08#getting-and-building-the-code):
->>>>>>> 6548a11 (README: minor improvements (#25))
+* [USD](https://github.com/PixarAnimationStudios/OpenUSD/tree/v21.11#getting-and-building-the-code):
     Note: USD support is only available when building sdformat from source. USD requires CMAKE 3.12 this package is available from Ubuntu 20.0.
 
     Clone the USD repository
     ```bash
-<<<<<<< HEAD
-    git clone --depth 1 -b v21.11 https://github.com/PixarAnimationStudios/USD.git
-=======
-    git clone --depth 1 -b v24.08 https://github.com/PixarAnimationStudios/OpenUSD.git
->>>>>>> 6548a11 (README: minor improvements (#25))
+    git clone --depth 1 -b v21.11 https://github.com/PixarAnimationStudios/OpenUSD.git
     ```
     Note: Only v21.11 supported currently
 
@@ -47,11 +39,7 @@ You will need all of the dependencies for sdformat, along with the following add
     Use the build script to compile USD. In order to speed up compilation, it is recommended to disable unneeded components.
     ```bash
     cd USD
-<<<<<<< HEAD
-    python3 build_scripts/build_usd.py --build-variant release --no-tests --no-examples --no-tutorials --no-docs --no-python <install_dir>
-=======
     python3 build_scripts/build_usd.py --build-variant release --no-tests --no-examples --no-imaging --onetbb --no-tutorials --no-docs --no-python $USD_PATH
->>>>>>> 6548a11 (README: minor improvements (#25))
     ```
     For more information regarding the build options, see the USD docs at https://github.com/PixarAnimationStudios/OpenUSD/tree/v21.11#getting-and-building-the-code.