From 973f545f69be16dc3e4fdddf86198baaef7f45d8 Mon Sep 17 00:00:00 2001 From: Quentin Peter Date: Sat, 5 Nov 2022 16:33:41 +0100 Subject: [PATCH] git subrepo clone (merge) --branch=master --force https://github.com/spyder-ide/spyder-kernels.git external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "34a6d6343" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "master" commit: "34a6d6343" git-subrepo: version: "0.4.5" origin: "https://github.com/ingydotnet/git-subrepo" commit: "aa416e4" --- external-deps/spyder-kernels/.gitrepo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 9f619db0d8c..8289cc5780e 100644 --- a/external-deps/spyder-kernels/.gitrepo +++ b/external-deps/spyder-kernels/.gitrepo @@ -5,8 +5,8 @@ ; [subrepo] remote = https://github.com/spyder-ide/spyder-kernels.git - branch = c_standard_stream - commit = 155843073e8586af54bf0fa70687d008274257ce - parent = 07385551725bfbd1711ddefc2a278972ac5709fd + branch = master + commit = 34a6d634383f27c61cd92172be94c1b344bc5cf1 + parent = f80c897ac6aafb65c421da50a63e2092f32ff7e2 method = merge cmdver = 0.4.5