From dfc80bf956a344dcd185f6db2980af7919c52e0d Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Wed, 5 May 2021 15:00:19 -0400
Subject: Fix merge conflicts

---
 upstream-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'upstream-commit')

diff --git a/upstream-commit b/upstream-commit
index 09b84e94..1fcb00de 100644
--- a/upstream-commit
+++ b/upstream-commit
@@ -1 +1 @@
-0655447cec1e22ba0b95a13d8f1b56cc4c2cb699
+9771de16f1f447976898449d1313d7cd84a6c990
-- 
cgit v1.2.3-56-ge451