From 5676e2d68f9da6190d976215c29e842424c6ca21 Mon Sep 17 00:00:00 2001 From: Alexander Bias Date: Thu, 25 Jul 2024 21:06:44 +0200 Subject: [PATCH] Development: Rename master branch to main, please update your clones. --- CHANGES.md | 1 + README.md | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c12b813..eed5ed0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Changes ### Rolling release +* 2024-07-25 - Development: Rename master branch to main, please update your clones. * 2024-07-23 - Change Moodle-Plugin-CI to run on Moodle Core 4.4 and Boost Union 4.4 * 2024-07-23 - Make codechecker happy again. * 2024-04-06 - Adopt Boost Union Child settings to the settings changes in the upcoming Boost Union v4.3-r11 release and for Moodle 4.4. diff --git a/README.md b/README.md index c54fb4c..b7e68cd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ moodle-theme_boost_union_child ============================== -[![Moodle Plugin CI](https://github.com/moodle-an-hochschulen/moodle-theme_boost_union_child/workflows/Moodle%20Plugin%20CI/badge.svg?branch=master)](https://github.com/moodle-an-hochschulen/moodle-theme_boost_union_child/actions?query=workflow%3A%22Moodle+Plugin+CI%22+branch%3Amaster) +[![Moodle Plugin CI](https://github.com/moodle-an-hochschulen/moodle-theme_boost_union_child/workflows/Moodle%20Plugin%20CI/badge.svg?branch=main)](https://github.com/moodle-an-hochschulen/moodle-theme_boost_union_child/actions?query=workflow%3A%22Moodle+Plugin+CI%22+branch%3Amain) Boost Union Child is a boilerplate for enhancing Boost Union with custom or local functionality. @@ -132,10 +132,10 @@ Of course, the example code is completed by a Behat test which verifies now and ### Applying the example code branches -As the example code is provided in a simple git branch, you can just merge the code into the master branch if you like and continue from there: +As the example code is provided in a simple git branch, you can just merge the code into the main branch if you like and continue from there: ``` -git checkout master +git checkout main git merge extension-setting-scss-variable ```