tree a3b7c94190bd4ee8c1a122ad4f7ebe0cfed54c2e
parent 79918c66c27e08a622e1f3ed21cf3340e24884b3
author Frappe <frappe@Frappes-MacBook-Air.local> 1498761839 +0530
committer Frappe <frappe@Frappes-MacBook-Air.local> 1499077807 +0530

Resolved conflicts in index.md