something weird with upstream tag in ffdiaporama

[Fabrice Coutadeur]

Hi,

It worked: thank you very much!
I just uploaded 1.3.1 to git ;)

I'm just getting some warnings about hardening-no-fortify-functions
and hardening-no-relro that I will look after tomorrow.

Thanks again,

Fabrice

2012/7/16 Alessio Treglia <alessio at debian.org>:
> On Mon, Jul 16, 2012 at 7:25 AM, Fabrice Coutadeur <coutadeurf at gmail.com> wrote:
>> Automatic merge failed; fix conflicts and then commit the result.
>> gbp:error: git returned 1
>> gbp:error: Couldn't merge from "upstream/1.3.1"
>> gbp:error: Merge failed, please resolve.
>
> This is easier than I originally imagined. Simply, the two branches
> weren't merged, so please try again now.
>
> --
> Alessio Treglia          | www.alessiotreglia.com
> Debian Developer         | alessio at debian.org
> Ubuntu Core Developer    | quadrispro at ubuntu.com
> 0416 0004 A827 6E40 BB98 90FB E8A4 8AE5 311D 765A