summaryrefslogtreecommitdiffstats
path: root/pre_commit_hooks/check_merge_conflict.py (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Adding upstream version 4.5.0+dfsg.upstream/4.5.0+dfsgupstreamDaniel Baumann2024-05-211-0/+56
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>