You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@incubator.apache.org by jm...@apache.org on 2022/09/20 08:01:08 UTC

[incubator] 42/46: Merge branch 'ApacheConSlides' of https://github.com/justinmclean/incubator-training into justinmclean-ApacheConSlides

This is an automated email from the ASF dual-hosted git repository.

jmclean pushed a commit to branch ApacheConSlides
in repository https://gitbox.apache.org/repos/asf/incubator.git

commit 7c1dcb2dd7974c5839cfae8ee3fc90154eb1e912
Merge: 6c807b7c 78ee50cd
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Tue Sep 20 17:37:13 2022 +1000

    Merge branch 'ApacheConSlides' of https://github.com/justinmclean/incubator-training into justinmclean-ApacheConSlides
    
    # Conflicts:
    #       content/Conferences/ApacheCon/src/main/asciidoc/index_en.adoc

 content/Apache/MyNewt/NOTICE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org