Merge master
This commit is contained in:
commit
131cd9cff6
76 changed files with 1390 additions and 854 deletions
|
@ -29,7 +29,11 @@ var app = require('app');
|
|||
app.addRecentDocument('/Users/USERNAME/Desktop/work.type');
|
||||
```
|
||||
|
||||
<<<<<<< HEAD
|
||||
You can use [app.clearRecentDocuments](clearrecentdocuments) API to empty
|
||||
=======
|
||||
And you can use [app.clearRecentDocuments][clearrecentdocuments] API to empty
|
||||
>>>>>>> master
|
||||
the recent documents list:
|
||||
|
||||
```javascript
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue