Fix merge conflicts

mpenning · Oct 10, 2023 · 37e76b2 · 37e76b2
2 parents 757258c + e13ba41
commit 37e76b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,11 @@
 - Summary:
     - Insert something here
 
+## Version: 1.8.2
+
+- Released: 2023-10-10
+- Summary:
+    - Remove better_exceptions
 
 ## Version: 1.8.1
 

diff --git a/README.md b/README.md
@@ -84,7 +84,6 @@ Dependencies
 - [dnspython](https://github.com/rthalley/dnspython)
 - [loguru](https://github.com/Delgan/loguru)
 - [deprecated](https://github.com/tantale/deprecated)
-- [better-exceptions](https://github.com/Qix-/better-exceptions)
 
 Is this a tool, or is it artwork?
 ---------------------------------

diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,7 @@ requires-python = ">=3.7.0"
 # however, pip will NOT install unless I base pyproject.toml on the
 # [tool.poetry] section below.
 #
-# Maybe it's my fault, but I have not had success trying to migrate to 
+# Maybe it's my fault, but I have not had success trying to migrate to
 # a [project] section with pip installs.  I have stopped trying because
 # the problem is too complicated to continue throwing cycles at making a
 # [project] section work with 'pip install ciscoconfparse'.