From 28c80b7caca7e52fd959fcda9c9c4ed257e56c67 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Mon, 19 Aug 2024 12:14:33 -0500 Subject: [PATCH] git subrepo pull (merge) --remote=https://github.com/spyder-ide/spyder-kernels.git --branch=master --update --force external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "e8a4a85ac6" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "master" commit: "e8a4a85ac6" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" --- external-deps/spyder-kernels/.gitrepo | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 60bb1d83632..d5ff008a9b0 100644 --- a/external-deps/spyder-kernels/.gitrepo +++ b/external-deps/spyder-kernels/.gitrepo @@ -4,9 +4,9 @@ ; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme ; [subrepo] - remote = https://github.com/ccordoba12/spyder-kernels.git - branch = add-envinfo-handler - commit = c09aa621bb377c79430900d92275963a171a262d - parent = 823059f772cfce0d1b81f4c39bb92ae4dd1202e6 + remote = https://github.com/spyder-ide/spyder-kernels.git + branch = master + commit = e8a4a85ac68f59c181b0c5df846eb0a88afcdec3 + parent = 593c57dcb8b3a16837a47b9d8494586dde045bc0 method = merge cmdver = 0.4.3