diff options
| -rw-r--r-- | background_scripts/main.coffee | 3 |
1 files changed, 0 insertions, 3 deletions
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 |