fix merge conflict

ga4gh · Apr 17, 2024 · 6fea3d8 · 6fea3d8
1 parent de7b818
commit 6fea3d8
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/source/concepts/index.rst b/docs/source/concepts/index.rst
@@ -14,7 +14,4 @@ These models exist across several related domains:
     :hidden:
 
     location/SequenceLocation
-<<<<<<< HEAD
     molecular_variation/index
-=======
->>>>>>> 2.x