chore(pre-commit): add check-merge-conflict hook - #182

chore(pre-commit): add check-merge-conflict hook#182

lusoris merged 1 commit into

masterVMAFx/vmafx:masterfrom

chore/pre-commit-conflict-marker-auditVMAFx/vmafx:chore/pre-commit-conflict-marker-auditCopy head branch name to clipboard