The following commit has been merged in the master branch:
commit 0a9ce172c2024fb1a03264209f0b471edcec750a
Author: Olivier Sallou <[email protected]>
Date: Mon Jul 29 08:46:28 2013 +0200
fix merge with panel
diff --git a/lib/Bio/Graphics/Panel.pm b/lib/Bio/Graphics/Panel.pm
index 8c28ba0..bab836f 100755
--- a/lib/Bio/Graphics/Panel.pm
+++ b/lib/Bio/Graphics/Panel.pm
@@ -536,13 +536,8 @@ sub gd {
}
$self->{translations} = \%translation_table;
-<<<<<<< HEAD
- $self->{gd} = $gd->isa('GD::SVG') ? $gd
- : $self->truetype ?
Bio::Graphics::GDWrapper->new($gd,$self->truetype)
-=======
$self->{gd} = $gd->isa('GD::SVG::Image') ? $gd
: $self->truetype ?
Bio::Graphics::GDWrapper->new($gd,$self->truetype)
->>>>>>> upstream/2.37
: $gd;
eval {$gd->alphaBlending(0)};
@@ -625,8 +620,6 @@ sub gd {
return $self->{gd} = $self->rotate ? $gd->copyRotate90 : $gd;
}
-<<<<<<< HEAD
-=======
sub gdfont {
my $self = shift;
my $font = shift;
@@ -647,7 +640,6 @@ sub gdfont {
}
}
->>>>>>> upstream/2.37
sub string_width {
my $self = shift;
my ($font,$string) = @_;
--
Generate GD images of Bio::Seq objects.
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
