Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'custom' into mycustom

  • Loading branch information...
commit ece6db86b64517e22950e6639f818064ecc0af91 2 parents 7007cfa + 07ddc16
Seitarou authored March 08, 2012

Showing 1 changed file with 1 addition and 5 deletions. Show diff stats Hide diff stats

  1. 6  tumblr_life.user.js
6  tumblr_life.user.js
@@ -790,12 +790,8 @@ function menuReblog(state, ex) {
790 790
 					self.reblogging = false;
791 791
 					container.className = container.className.replace('tumblrlife-reblogging', 'tumblrlife-reblogged');
792 792
 					menu_container.removeEventListener('click', self, false);
793  
-<<<<<<< HEAD
794  
-					menu_container.innerHTML = 'reblogged' + (state ? {
795  
-                        'add-to-channel': ' (ch: ' + ex.channel_id + ')',
796  
-=======
797 793
 					menu_container.innerHTML = '<span>reblogged' + (state ? {
798  
->>>>>>> master
  794
+                        'add-to-channel': ' (ch: ' + ex.channel_id + ')',
799 795
 						'add-to-queue': ' (queue)',
800 796
 						'private'     : ' (private)'
801 797
 					}[state] : '') + '</span>';

0 notes on commit ece6db8

Please sign in to comment.
Something went wrong with that request. Please try again.