Update web_client.md

slackapi · Feb 16, 2019 · a7b8682 · a7b8682
1 parent 6b1af92
commit a7b8682
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/_pages/web_client.md b/docs/_pages/web_client.md
@@ -17,13 +17,10 @@ headings:
     - title: Custom agent for proxy support
     - title: OAuth token exchange
     - title: Using legacy message attachments
-<<<<<<< HEAD
-=======
     - title: Using a callback instead of a Promise (deprecated)
     - title: Calling methods on behalf of users (deprecated)
     - title: Using refresh tokens (deprecated)
     - title: Manually handling token rotation (deprecated)
->>>>>>> master
 
 ---