From 25a92829ab509091097d6d610cadb0e2dc6231dd Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 9 Feb 2015 14:17:47 +0000
Subject: Actually fix the conflicts in the previous merge.

Fix conflicts from 9f20c33adf75e2e78b35e2cd16f2a0925a72c577.
---
 background_scripts/main.coffee | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'background_scripts')

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 8f51b374..d8471b45 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -172,10 +172,7 @@ upgradeNotificationClosed = (request) ->
 # We return null to avoid the return value from the copy operations being passed to sendResponse.
 #
 copyToClipboard = (request) -> Clipboard.copy(request.data); null
-<<<<<<< HEAD
 pasteFromClipboard = (request) -> Clipboard.paste(); null
-=======
->>>>>>> @{-1}
 
 #
 # Selects the tab with the ID specified in request.id
-- 
cgit v1.2.3