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

Fix conflict

Browse source
This commit is contained in:
Jessica Lord 2015-09-02 17:09:37 -07:00
parent 131cd9cff6
commit 66a1405d2b
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,11 +29,7 @@ var app = require('app');
app.addRecentDocument('/Users/USERNAME/Desktop/work.type'); 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 And you can use [app.clearRecentDocuments][clearrecentdocuments] API to empty
>>>>>>> master
the recent documents list: the recent documents list:
```javascript ```javascript