diff options
| author | Stephen Blott | 2015-02-09 14:17:47 +0000 |
|---|---|---|
| committer | Stephen Blott | 2015-02-09 14:17:47 +0000 |
| commit | 25a92829ab509091097d6d610cadb0e2dc6231dd (patch) | |
| tree | b861b237612d94f5543f401dae9a45b9c4a9a6de | |
| parent | 9f20c33adf75e2e78b35e2cd16f2a0925a72c577 (diff) | |
| download | vimium-25a92829ab509091097d6d610cadb0e2dc6231dd.tar.bz2 | |
Actually fix the conflicts in the previous merge.
Fix conflicts from 9f20c33adf75e2e78b35e2cd16f2a0925a72c577.
| -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 |