Upd CHANGELOG.md

AdguardTeam · Nov 13, 2023 · dd965dc · dd965dc
1 parent 8c036ba
commit dd965dc
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,8 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Filtering of empty lines during the `@include` directive's `/addModifiers` option applying
 
-## [Unreleased]
-
 ### Changed
 
 - Updated [@adguard/filters-downloader] to v1.1.23
@@ -256,11 +254,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated [@adguard/tsurlfilter] to v1.0.51, [@adguard/scriptlets] to v1.7.3
 
 
-<<<<<<< HEAD
 [v1.1.106]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.105...v1.1.106
-=======
-[Unreleased]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.105...HEAD
->>>>>>> 67d143be0c614fb733bca5898ee2fc1204c9f9e3
 [v1.1.105]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.104...v1.1.105
 [v1.1.104]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.102...v1.1.104
 [v1.1.102]: https://github.com/AdguardTeam/FiltersCompiler/compare/v1.1.101...v1.1.102