fix conflict
tree: 9c514024d28d0bf1d058a6b676d210804dd39f97
  1. README.md
  2. docs-site/
README.md

SINGA-Doc

This repo hosts the documentation files of Apache SINGA.