From mboxrd@z Thu Jan  1 00:00:00 1970
From: Pierre Neidhardt <mail@ambrevar.xyz>
Subject: Re: Packaging Jami progress
Date: Tue, 26 Nov 2019 20:14:33 +0100
Message-ID: <87mucilaau.fsf@ambrevar.xyz>
References: <20191104214754.793ec2ff@interia.pl> <87pni5qouc.fsf@ambrevar.xyz>
 <20191106172445.3bdd057d@interia.pl> <87r22lorwh.fsf@ambrevar.xyz>
 <877e4bo646.fsf@ambrevar.xyz> <20191107204757.23dd08de@interia.pl>
 <874kzfo21r.fsf@ambrevar.xyz> <20191108192542.5daa7a0a@interia.pl>
 <87zhh2kdt2.fsf@ambrevar.xyz> <20191111111423.66ec31d5@interia.pl>
 <87r22ek7x4.fsf@ambrevar.xyz> <874kzajvy9.fsf@ambrevar.xyz>
 <20191111163843.0629ef41@kompiuter> <87o8xe4d5m.fsf@ambrevar.xyz>
 <87eeya49hf.fsf@ambrevar.xyz> <20191114214010.7b61005f@kompiuter>
 <87lfsikttk.fsf@ambrevar.xyz> <20191114231605.0ecec870@kompiuter>
 <87a797o6hb.fsf@ambrevar.xyz> <20191125221517.1140d0c9@kompiuter>
 <CAJ3okZ0zMbEds=fBoG2td_83RvUQMEBYLPUqU6aUsY7pbjOcmQ@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha256; protocol="application/pgp-signature"
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:33548)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <mail@ambrevar.xyz>) id 1iZgII-0000YZ-UC
 for guix-devel@gnu.org; Tue, 26 Nov 2019 14:14:40 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <mail@ambrevar.xyz>) id 1iZgIH-0003Q7-S3
 for guix-devel@gnu.org; Tue, 26 Nov 2019 14:14:38 -0500
Received: from relay2-d.mail.gandi.net ([217.70.183.194]:33875)
 by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <mail@ambrevar.xyz>) id 1iZgIH-0003Ot-LR
 for guix-devel@gnu.org; Tue, 26 Nov 2019 14:14:37 -0500
In-Reply-To: <CAJ3okZ0zMbEds=fBoG2td_83RvUQMEBYLPUqU6aUsY7pbjOcmQ@mail.gmail.com>
List-Id: "Development of GNU Guix and the GNU System distribution."
 <guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: zimoun <zimon.toutoune@gmail.com>, Jan <tona_kosmicznego_smiecia@interia.pl>
Cc: Guix-devel <guix-devel@gnu.org>

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

I'm not sure how to apply conflicting patches with Magit.  Good
question, I'd like to know how to do it too! :)

=2D-=20
Pierre Neidhardt
https://ambrevar.xyz/

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAl3deZkACgkQm9z0l6S7
zH+0jgf/f1Tlif3thX3bWyYLlOfI4LPdH9iFWtCgFYsusMgIrD4pG5E9sz7tnJgr
ivLZhCiPOsluYveLQfW8fjLqlAWMhxROR4EXhMRO7TvW1sqERFuCKzaa0C1HeXw0
p+HETLgZOiC6WnQPuOoGxyfA5H3ojA7Ho44yzGgQ5ZrHHVg7AGlFwToqImWiYCZz
YkWsy6fW2XfrB1vg9LVaRIripTlkIbZd6uPWl9ilwCneqP+eV8CJeOFqHkSVWEUd
cZxmX9DG7nhg6YO7Wjw7RfLPBGtgT+h8mEwXrB6IaHiTBf7aEG4vbp1sdF1rjcEB
5cux4JfvvMxJOZM7bRTZOZMQD0kXKQ==
=w+LB
-----END PGP SIGNATURE-----
--=-=-=--