Permalink
Browse files

remove dangling conflict annotation

  • Loading branch information...
lstein committed Feb 10, 2012
1 parent ca7103c commit 09827512210302409875cfa8064a02c82eb59371
Showing with 0 additions and 4 deletions.
  1. +0 −4 lib/Bio/Graphics/Browser2/SubtrackTable.pm
@@ -454,10 +454,6 @@ sub infer_settings_from_source {
my @tags = sort grep {defined $_ && $_ ne 'dbid' && $tags{$_}==$count} keys %tags;
@dimensions = map {[ucfirst($_),'tag_value',$_]} @tags;
@rows = $package->get_facet_values($source,$label,@tags);
-<<<<<<< HEAD
-=======
-
->>>>>>> master
}
return unless @dimensions && @rows;

0 comments on commit 0982751

Please sign in to comment.