From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sun, 30 Apr 2023 22:18:29 +0000 (+0200)
Subject: Merge conflict resolution
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=f2187461ef62422e82454271544a80c05a34e716;p=nb.git

Merge conflict resolution
---

f2187461ef62422e82454271544a80c05a34e716