Permalink
Browse files

ttlogmerge: fix brainless git merge error

  • Loading branch information...
1 parent 12a6ae7 commit 05cec5707dbad91d47587f36be18d6fb1bc67152 @pmyteh committed Dec 30, 2013
Showing with 0 additions and 3 deletions.
  1. +0 −3 script/ttlogmerge.pl
View
@@ -35,12 +35,9 @@ sub parse
{
my $s = $_[0];
my @tokens = split(/\s+/, $s);
-<<<<<<< Updated upstream
-=======
# XXX FIXME: This may fail where huge numbers of tags are added:
# It appears TT shortens the human-readable date string to stay
# under 80 characters per line.
->>>>>>> Stashed changes
for my $i (1..3) { pop(@tokens) } # Discard date string
# print "parse: ", $_[0], @tokens;
return @tokens;

0 comments on commit 05cec57

Please sign in to comment.