ref: merge conflict marker left in remote/modify (#4356)

iterative · Mar 3, 2023 · 0c966bf · 0c966bf
1 parent 8e39e3f
commit 0c966bf
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/content/docs/command-reference/remote/modify.md b/content/docs/command-reference/remote/modify.md
@@ -751,8 +751,6 @@ by HDFS. Read more about by expanding the WebHDFS section in
   ```
 
 </details>
-<<<<<<< HEAD
-=======
 
 ## Example: Some Azure authentication methods
 
@@ -792,5 +790,3 @@ $ dvc remote modify --local myremote account_name 'myaccount'
 $ dvc remote modify --local myremote sas_token 'mysecret'
 $ dvc push
 ```
-
-> > > > > > > main