From: Štěpán Balážik Date: Tue, 11 Aug 2020 14:18:27 +0000 (+0200) Subject: ci: fix divergent commit in Deckard submodule X-Git-Tag: v5.1.3~15^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0015de687651105c257188bf53fcba6c0b20d74c;p=thirdparty%2Fknot-resolver.git ci: fix divergent commit in Deckard submodule Branch on Deckard tree tracked in this repository was left unmerged in Deckard. The two trees therefore diverged and broke CI in knot-resolver repo on a few commits retroactively. --- diff --git a/tests/integration/deckard b/tests/integration/deckard index fe30083ea..e10182ce0 160000 --- a/tests/integration/deckard +++ b/tests/integration/deckard @@ -1 +1 @@ -Subproject commit fe30083ea07122125062d53a4b055b967b39794c +Subproject commit e10182ce098794c24b3a7686f1d3619f674dbb74