Update CHANGELOG.md

wemake-services · Mar 11, 2024 · 83d443c · 83d443c
1 parent 2f05d39
commit 83d443c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ Semantic versioning in our case means:
 
 - Fix `ForbiddenInlineIgnoreViolation` config parsing. #2590
 - Fix `WrongEmptyLinesCountViolation` for func definitions with ellipsis. #2847
+- Fix `WrongEmptyLinesCountViolation` for multiline implicit string concatination. #2787
 
 
 ## 0.18.0

diff --git a/tests/test_visitors/test_ast/test_classes/test_wrong_empty_lines_count.py b/tests/test_visitors/test_ast/test_classes/test_wrong_empty_lines_count.py
@@ -166,7 +166,6 @@ class Foo(object):
 fstrings_feature.deprecate()
 """
 
-<<<<<<< HEAD
 def_with_ellipsis = """
 class BaseResponse(Protocol):