chore: Fix changelog merge mistake (#467)

Benchling-Open-Source · Jun 18, 2024 · a18e504 · a18e504
1 parent 3346135
commit a18e504
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,12 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
-<<<<<<< mabtech_apex
 - Add Mabtech Apex adapter
-=======
 - Added support for parsing Vi-Cell XR txt files
 - Add Electrophoresis BENCHLING/2024/06 schema.
->>>>>>> main
 - Added github enforcement that CHANGELOG.md is updated
 - Added test files Agilent TapeStation Analysis