From b524b0b0c436c71552287d8a839eec7a985ae1fd Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 11 Mar 2021 10:46:20 +0100
Subject: [PATCH] resolve conflict

---
 repos/avalon-core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repos/avalon-core b/repos/avalon-core
index eae14f2960c..b6b56c4b3be 160000
--- a/repos/avalon-core
+++ b/repos/avalon-core
@@ -1 +1 @@
-Subproject commit eae14f2960c4ccf2f0211e0726e88563129c0296
+Subproject commit b6b56c4b3be612138fb2df6f11c8e27f11c62ffd