Merge branch 'main' into P5V6

talisein · Sep 20, 2023 · 8df0360 · 8df0360
2 parents 5c7d6ae + e9bfcc0
commit 8df0360
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -78,7 +78,7 @@ jobs:
     continue-on-error: ${{ matrix.is-experimental }}
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - if: ${{ matrix.compiler == 'clang' && matrix.flavor == 'ubuntu' }}
         name: Install clang ubuntu
@@ -316,7 +316,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create Release
         id: create_release

diff --git a/src/part4_defs.h b/src/part4_defs.h
@@ -421,11 +421,11 @@ namespace part_4_defs
 
 { volume::P4V4, "Text/chapter2.xhtml"sv, "application/xhtml+xml"sv, "Meeting the Scholars"sv, true },
 { volume::P4V4, "Text/chapter3.xhtml"sv, "application/xhtml+xml"sv, "Life in the Temple"sv, true },
+{ volume::P4V4, "Text/insert2.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true },
+{ volume::P4V4, "Text/chapter3_1.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true },
 
 { volume::SSC1, "Text/chapter20.xhtml"sv, "application/xhtml+xml"sv, "Charlotte — My Task"sv, true },
 
-{ volume::P4V4, "Text/insert2.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true },
-{ volume::P4V4, "Text/chapter3_1.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true },
 { volume::P4V4, "Text/chapter4.xhtml"sv, "application/xhtml+xml"sv, "Schwartz’s and Weiss’s Outfits"sv, true },
 { volume::P4V4, "Text/chapter5.xhtml"sv, "application/xhtml+xml"sv, "Magic Ink"sv, true },
 { volume::P4V4, "Text/insert3.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true },