From 3029b7cb2ad29a9ddfe7ad69953123f2a146e9b4 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 13 Jun 2017 17:16:34 +0300
Subject: [PATCH] - Use the fixed version of the merge-conflict pre-commit hook
locally.
---
.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 c642bb2..8f38120 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,6 +12,6 @@
- id: shellcheck
files: *shellscripts
- repo: https://www.shore.co.il/git/git-pre-commit/
- sha: v0.1.0
+ sha: v0.1.1
hooks:
- id: merge-conflict
--
GitLab