Resolve diff

cohere-ai · Dec 1, 2024 · 24b8ded · 24b8ded
1 parent 23bd85b
commit 24b8ded
Showing 1 changed file with 4 additions and 31 deletions.
diff --git a/cohere-openapi.yaml b/cohere-openapi.yaml
@@ -16268,27 +16268,10 @@ paths:
           request:
             documents:
               - text: Carson City is the capital city of the American state of Nevada.
-              - text: The Commonwealth of the Northern Mariana Islands is a group of islands in
-                  the Pacific Ocean. Its capital is Saipan.
-              - text: Capitalization or capitalisation in English grammar is the use of a
-                  capital letter at the start of a word. English usage varies
-                  from capitalization in other languages.
-              - text: Washington, D.C. (also known as simply Washington or D.C., and officially
-                  as the District of Columbia) is the capital of the United
-                  States. It is a federal district.
-<<<<<<< HEAD
-              - text: Capital punishment has existed in the United States
-                  since beforethe United States was a country. As of 2017,
-                  capital punishment is legal in 30 of the 50 states.
-||||||| 960fbc3
-              - text: Capital punishment (the death penalty) has existed in the United States
-                  since beforethe United States was a country. As of 2017,
-                  capital punishment is legal in 30 of the 50 states.
-=======
-              - text: Capital punishment has existed in the United States since beforethe United
-                  States was a country. As of 2017, capital punishment is legal
-                  in 30 of the 50 states.
->>>>>>> main
+              - text: The Commonwealth of the Northern Mariana Islands is a group of islands in the Pacific Ocean. Its capital is Saipan.
+              - text: Capitalization or capitalisation in English grammar is the use of a capital letter at the start of a word. English usage varies from capitalization in other languages.
+              - text: Washington, D.C. (also known as simply Washington or D.C., and officially as the District of Columbia) is the capital of the United States. It is a federal district.
+              - text: Capital punishment has existed in the United States since beforethe United States was a country. As of 2017, capital punishment is legal in 30 of the 50 states.
             query: What is the capital of the United States?
             top_n: 3
             model: rerank-english-v3.0
@@ -16613,19 +16596,9 @@ paths:
               - Washington, D.C. (also known as simply Washington or D.C., and
                 officially as the District of Columbia) is the capital of the
                 United States. It is a federal district.
-<<<<<<< HEAD
-              - Capital punishment has existed in the United
-                States since beforethe United States was a country. As of 2017,
-                capital punishment is legal in 30 of the 50 states.
-||||||| 960fbc3
-              - Capital punishment (the death penalty) has existed in the United
-                States since beforethe United States was a country. As of 2017,
-                capital punishment is legal in 30 of the 50 states.
-=======
               - Capital punishment has existed in the United States since
                 beforethe United States was a country. As of 2017, capital
                 punishment is legal in 30 of the 50 states.
->>>>>>> main
             query: What is the capital of the United States?
             top_n: 3
             model: rerank-english-v3.0