fixed documentation typos from bad merge

dtcenter · Jun 30, 2021 · 6fa6605 · 6fa6605
1 parent 2ff460c
commit 6fa6605
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/docs/Users_Guide/quicksearch.rst b/docs/Users_Guide/quicksearch.rst
@@ -64,7 +64,6 @@ Use Cases by Application:
 
 .. only:: html
 
-<<<<<<< HEAD
    | `Air Quality and Composition <../search.html?q=AirQualityAndCompAppUseCase&check_keywords=yes&area=default>`_
    | `Climate <../search.html?q=ClimateAppUseCase&check_keywords=yes&area=default>`_
    | `Convection Allowing Models <../search.html?q=ConvectionAllowingModelsAppUseCase&check_keywords=yes&area=default>`_
@@ -77,17 +76,6 @@ Use Cases by Application:
    | `Space Weather <../search.html?q=SpaceWeatherAppUseCase&check_keywords=yes&area=default>`_
    | `Subseasonal to Seasonal <../search.html?q=S2SAppUseCase&check_keywords=yes&area=default>`_
    | `Tropical Cyclone and Extra-Tropical Cyclone <../search.html?q=TCandExtraTCAppUseCase&check_keywords=yes&area=default>`_
-=======
-   | `Climate <https://metplus.readthedocs.io/en/develop/search.html?q=ClimateAppUseCase&check_keywords=yes&area=default>`_
-   | `Convection Allowing Models <https://metplus.readthedocs.io/en/develop/search.html?q=ConvectionAllowingModelsAppUseCase&check_keywords=yes&area=default>`_
-   | `Ensemble  <https://metplus.readthedocs.io/en/develop/search.html?q=EnsembleAppUseCase&check_keywords=yes&area=default>`_
-   | `Marine and Cryosphere <https://metplus.readthedocs.io/en/develop/search.html?q=MarineAndCryoAppUseCase&check_keywords=yes&area=default>`_
-   | `Medium Range <https://metplus.readthedocs.io/en/develop/search.html?q=MediumRangeAppUseCase&check_keywords=yes&area=default>`_
-   | `Precipitation <https://metplus.readthedocs.io/en/develop/search.html?q=PrecipitationAppUseCase&check_keywords=yes&area=default>`_
-   | `Space Weather <https://metplus.readthedocs.io/en/develop/search.html?q=SpaceWeatherAppUseCase&check_keywords=yes&area=default>`_
-   | `Subseasonal to Seasonal <https://metplus.readthedocs.io/en/develop/search.html?q=S2SAppUseCase&check_keywords=yes&area=default>`_
-   | `Tropical Cyclone and Extra-Tropical Cyclone <https://metplus.readthedocs.io/en/develop/search.html?q=TCandExtraTCAppUseCase&check_keywords=yes&area=default>`_
->>>>>>> develop-ref
 
 .. only:: latex
 

diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst
@@ -1,4 +1,4 @@
-**************
+***************
 Python Wrappers
 ***************