github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-11 00:18:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

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');
```
<<<<<<< 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