From 4c6281beb32a7f88e0f843c575c3f16d65936c6e Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Tue, 18 Oct 2022 17:49:18 +0200 Subject: fixed some merges and branches in submodules --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 0f12f42..1e0d116 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,9 +27,12 @@ path = maintained/check_ssl_cert url = ssh://aur@aur.archlinux.org/check_ssl_cert.git branch = master + update = merge [submodule "maintained/thruk"] path = maintained/thruk url = ssh://aur@aur.archlinux.org/thruk.git + branch = master + update = merge [submodule "maintained/z80ex"] path = maintained/z80ex url = ssh://aur@aur.archlinux.org/z80ex -- cgit v1.2.3-54-g00ecf