From 7e998f922830ab0516837a133e0ce4aaf736b006 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Tue, 10 Oct 2023 16:33:51 +1000
Subject: [PATCH] pre-commit: add hook `check-merge-conflict` (#7883)

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f7c3c0f90e1..d41673fb742 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
       #- id: check-added-large-files
       - id: check-case-conflict
       #- id: check-executables-have-shebangs
-      #- id: check-merge-conflict
+      - id: check-merge-conflict
       - id: check-vcs-permalinks
       #- id: check-yaml
       - id: detect-private-key