From be5e09a8333e80a089d29b1c8e5e0085394ceeab Mon Sep 17 00:00:00 2001
From: gongweibao <gongweibao@baidu.com>
Date: Thu, 9 Mar 2017 09:17:20 +0800
Subject: [PATCH] resolve confict

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f7020e3..6888e23 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -28,7 +28,7 @@
   hooks:
     -  id: convert-markdown-into-html
        name: convert-markdown-into-html
-       description: "Convert README.md into index.html and README.en.md into index.en.html"
+       description: Convert README.md into index.html and README.en.md into index.en.html
        entry: python pre-commit-hooks/convert_markdown_into_html.py
        language: system
        files: \.md$
@@ -36,7 +36,7 @@
   hooks:
     -  id: convert-markdown-into-ipynb
        name: convert-markdown-into-ipynb
-       description: "Convert README.md into README.ipynb and README.en.md into README.en.ipynb"
+       description: Convert README.md into README.ipynb and README.en.md into README.en.ipynb
        entry: ./pre-commit-hooks/convert_markdown_into_ipynb.sh
        language: system
        files: \.md$
-- 
GitLab