Le 5257 Septembre 1993, Stefan Reichör a tapoté:
> Hi Daniel!
>
>> Committed revision 148 to http://www.asgardr.info/~nebu/archives/dvc.dev/
>>
>> Add missing Makefile rule.
>>   
>>   * lisp/Makefile.in (dvc-site.el): add dvc-site.el.in Makefile rule.
>
> I tried to merge your patch and I got the following conflict.
>

[...]

> Toby, Daniel: could you please discuss a solution that works for both of you.

Toby solution was the good one. It just broke my debian build so I
fix it.

Regards.
-- 
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x6A2540D1

_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev

Reply via email to