From: Dessalines <tyhou13@gmx.com>
Date: Sat, 10 Aug 2019 00:19:09 +0000 (-0700)
Subject: Fixing merge conflicts.
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%24%7B%60data:application/%22https:/hacktivis.me/%7Blink%7D?a=commitdiff_plain;h=9436a1724d9224b0c3c65d61f03d97386292d7c8;p=lemmy.git

Fixing merge conflicts.
---

9436a1724d9224b0c3c65d61f03d97386292d7c8