From b545df1fffa5a12fbe16832743825a7b00bf2c9d Mon Sep 17 00:00:00 2001
From: Yi Wang <yiwang01@baidu.com>
Date: Tue, 7 Mar 2017 16:16:49 -0800
Subject: [PATCH] Resolve conflicts

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

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fefc7e1..41d6de6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,6 +6,7 @@
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     sha: v0.7.1
     hooks:
+    -   id: check-merge-conflict
     -   id: check-symlinks
     -   id: detect-private-key
     -   id: end-of-file-fixer
-- 
GitLab