From 66a1405d2b415c9b4cb97dd4ac2a3db173dd2957 Mon Sep 17 00:00:00 2001
From: Jessica Lord <jlord@github.com>
Date: Wed, 2 Sep 2015 17:09:37 -0700
Subject: [PATCH] Fix conflict

---
 docs/tutorial/desktop-environment-integration.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/tutorial/desktop-environment-integration.md b/docs/tutorial/desktop-environment-integration.md
index d827091bcd13..3132edffcc27 100644
--- a/docs/tutorial/desktop-environment-integration.md
+++ b/docs/tutorial/desktop-environment-integration.md
@@ -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