提交 be5e09a8 编写于 作者: G gongweibao

resolve confict

上级 60537799
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
hooks: hooks:
- id: convert-markdown-into-html - id: convert-markdown-into-html
name: 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 entry: python pre-commit-hooks/convert_markdown_into_html.py
language: system language: system
files: \.md$ files: \.md$
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
hooks: hooks:
- id: convert-markdown-into-ipynb - id: convert-markdown-into-ipynb
name: 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 entry: ./pre-commit-hooks/convert_markdown_into_ipynb.sh
language: system language: system
files: \.md$ files: \.md$
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册