looks like I changed stuff?

2021-06-25 20:29:27 -05:00
parent 917649b1b2 523e35e4f3
commit 34f6c5db10
78 changed files with 2136 additions and 2539 deletions
--- a/docs/whats_new.rst
+++ b/docs/whats_new.rst
@@ -32,6 +32,10 @@ Likewise, **this is the last version to support user bots**.

 Development of v2.0 will have breaking changes and support for newer API features.

+<<<<<<< HEAD
+=======
+
+>>>>>>> 523e35e4f3c3c49d4e471359f9fb559242bbecc8
 - Add support for stage channels via :class:`StageChannel` (:issue:`6602`, :issue:`6608`)
 - Add support for :attr:`MessageReference.fail_if_not_exists` (:issue:`6484`)
    - By default, if the message you're replying to doesn't exist then the API errors out.