From d25e9d2e2a1895c36c35e9e0fa590715ae9cdfd9 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Fri, 17 Jan 2025 11:43:08 -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: "fa909029b8" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "master" commit: "fa909029b8" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "ea10886" [ci skip] --- 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 934f83a951a..98b1f24244d 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 = filter-traceback-frames - commit = 8b9c4f0c8375318c88e21c44cacbb2b5bf5515f5 - parent = 5106b0f412b4c1e1af621c26f303f8b711618012 + remote = https://github.com/spyder-ide/spyder-kernels.git + branch = master + commit = fa909029b8f371b985d75422b503e222968a2ac0 + parent = 95e1e15db7245e981a2ce981bfd788a007c5251c method = merge cmdver = 0.4.9