merge conflicts fixed

This commit is contained in:
Umair Sayed
2018-09-03 12:59:50 +05:30
parent 7f77f1bb26
commit 46de031a44
1949 changed files with 2862 additions and 234155 deletions

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]