fix api docs (#2046)

bihealth · Dec 12, 2024 · e582c7f · e582c7f
1 parent 230d83e
commit e582c7f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 42 deletions.
diff --git a/docs_manual/source/api_irodsinfo.rst b/docs_manual/source/api_irodsinfo.rst
@@ -25,17 +25,3 @@ API Views
 .. currentmodule:: irodsinfo.views_api
 
 .. autoclass:: IrodsEnvRetrieveAPIView
-<<<<<<< HEAD
-
-
-Versioning
-==========
-
-For accept header versioning, the following header is expected in the current
-SODAR version:
-
-.. code-block:: console
-
-    Accept: application/vnd.bihealth.sodar+json; version=0.15.1
-=======
->>>>>>> update rest api versioning (#1936)
diff --git a/docs_manual/source/api_landingzones.rst b/docs_manual/source/api_landingzones.rst
@@ -35,17 +35,3 @@ API Views
 .. autoclass:: ZoneSubmitDeleteAPIView
 
 .. autoclass:: ZoneSubmitMoveAPIView
-<<<<<<< HEAD
-
-
-Versioning
-==========
-
-For accept header versioning, the following header is expected in the current
-SODAR version:
-
-.. code-block:: console
-
-    Accept: application/vnd.bihealth.sodar+json; version=0.15.1
-=======
->>>>>>> update rest api versioning (#1936)
diff --git a/docs_manual/source/api_samplesheets.rst b/docs_manual/source/api_samplesheets.rst
@@ -71,17 +71,3 @@ iRODS Data Requests
 .. autoclass:: IrodsDataRequestAcceptAPIView
 
 .. autoclass:: IrodsDataRequestRejectAPIView
-<<<<<<< HEAD
-
-
-Versioning
-==========
-
-For accept header versioning, the following header is expected in the current
-SODAR version:
-
-.. code-block:: console
-
-    Accept: application/vnd.bihealth.sodar+json; version=0.15.1
-=======
->>>>>>> update rest api versioning (#1936)