Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Resolve conflicts
  • Loading branch information
syuilo committed Mar 29, 2018
1 parent 281b388 commit bfc193d
Show file tree
Hide file tree
Showing 308 changed files with 3,048 additions and 3,203 deletions.
3 changes: 0 additions & 3 deletions docs/config.md → .config/example.yml
@@ -1,4 +1,3 @@
``` yaml
# サーバーのメンテナ情報
maintainer:
# メンテナの名前
Expand Down Expand Up @@ -56,5 +55,3 @@ twitter:

# インテグレーション用アプリのコンシューマーシークレット
consumer_secret:

```
3 changes: 2 additions & 1 deletion .gitignore
@@ -1,4 +1,5 @@
/.config
/.config/*
!/.config/example.yml
/.vscode
/node_modules
/build
Expand Down

0 comments on commit bfc193d

Please sign in to comment.