From 577b396f132924570394191e4fcfeebc9f2e1403 Mon Sep 17 00:00:00 2001
From: RoaCode <176423185+RoaCode@users.noreply.github.com>
Date: Thu, 24 Oct 2024 12:49:01 -0400
Subject: [PATCH] refactor(CHANGELOG): Fixed pre-commit-config merge issue and
 CHANGELOG corrected

---
 .pre-commit-config.yaml | 8 --------
 CHANGELOG.md            | 7 ++++++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ba21f7ba..b0e2ef4e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -39,11 +39,7 @@ repos:
       - id: remove-tabs
       - id: forbid-tabs
   - repo: https://github.com/python-jsonschema/check-jsonschema
-<<<<<<< HEAD
     rev: aa1acdb72677dfbc5f507d2dfd45d8380bbcc2e0  # frozen: 0.29.3
-=======
-    rev: 5c70e3d884fdbe99af42f2714a444e39f321498d  # frozen: 0.29.2
->>>>>>> 409230f (feat(mso2kb.py): added support for mso2024b oscilloscope)
     hooks:
       - id: check-readthedocs
       - id: check-dependabot
@@ -51,11 +47,7 @@ repos:
       - id: check-github-workflows
         args: [--verbose]
   - repo: https://github.com/Mateusz-Grzelinski/actionlint-py
-<<<<<<< HEAD
     rev: 27445053da613c660ed5895d9616662059a53ca7  # frozen: v1.7.3.17
-=======
-    rev: c01fb5723b54075325cd9b5e5665a9ae84baf950  # frozen: v1.7.1.15
->>>>>>> 409230f (feat(mso2kb.py): added support for mso2024b oscilloscope)
     hooks:
       - id: actionlint
         additional_dependencies: [pyflakes, shellcheck-py]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7876fb6b..f776267a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,12 @@ Things to be included in the next release go here.
 
 ### Fixed
 
-- fix: TekScope2K active channel query needs VERBOSE and HEADER options enabled to function properly
+- fix: TekScope2K active channel query needs HEADER options enabled to function properly
+
+### Added
+
+- `collectgarbage()` is now called during cleanup of `TSPDevice` children.
+- Added USB Support for AFG31K and MDO3 models.
 
 ---