From e255f173a86182ff6898e1187b27da6a281c9c43 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 13 Jun 2017 16:43:59 +0300
Subject: [PATCH] - Use a working 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 05d44f9..c642bb2 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: master
+ sha: v0.1.0
hooks:
- id: merge-conflict
--
GitLab