mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge master

Browse source
This commit is contained in:
Jessica Lord 2015-09-02 10:23:37 -07:00
commit 131cd9cff6
76 changed files with 1390 additions and 854 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/tutorial/desktop-environment-integration.md
View file

@ -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