github-actions[bot] f3c34843e1 fix: Make Git conflict markers check more precise ... The https://github.com/super-linter/super-linter/pull/6113 introduced new Git merge conflicts linter check, that is error prone in some conditions (see screenshot). This PR adjusts this check to be more precise and exact in a way that all three markers should be found to identify check as failed. Additionally improve Git merge conflict markers matchers. Additionally update one good test file.		2024-11-20 15:31:02 +02:00
..
.release-please-manifest.json	fix: Make Git conflict markers check more precise	2024-11-20 15:31:02 +02:00
release-please-config.json	chore: fix formatting issues (#6028)	2024-08-15 10:21:26 +02:00