Permalink
Browse files

Merge branch 'custom' into mycustom

  • Loading branch information...
2 parents 7007cfa + 07ddc16 commit ece6db86b64517e22950e6639f818064ecc0af91 @poochin committed Mar 8, 2012
Showing with 1 addition and 5 deletions.
  1. +1 −5 tumblr_life.user.js
View
6 tumblr_life.user.js
@@ -790,12 +790,8 @@ function menuReblog(state, ex) {
self.reblogging = false;
container.className = container.className.replace('tumblrlife-reblogging', 'tumblrlife-reblogged');
menu_container.removeEventListener('click', self, false);
-<<<<<<< HEAD
- menu_container.innerHTML = 'reblogged' + (state ? {
- 'add-to-channel': ' (ch: ' + ex.channel_id + ')',
-=======
menu_container.innerHTML = '<span>reblogged' + (state ? {
->>>>>>> master
+ 'add-to-channel': ' (ch: ' + ex.channel_id + ')',
'add-to-queue': ' (queue)',
'private' : ' (private)'
}[state] : '') + '</span>';

0 comments on commit ece6db8

Please sign in to comment.