From: Arun <engineerarun@gmail.com>
Date: Tue, 26 Apr 2022 13:03:05 +0000 (+0530)
Subject: Merge pull request #1347 from luukvbaal/patches
X-Git-Tag: v4.5~1
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=43662474419fc4fae86041871f33b9be7d8acebb;p=nnn.git

Merge pull request #1347 from luukvbaal/patches

Fix patch conflicts and rebase
---

43662474419fc4fae86041871f33b9be7d8acebb