Merge branch 'main' into feat/new-py-helpers

freeCodeCamp · Apr 16, 2024 · 6d0947d · 6d0947d
2 parents eca461e + 970713f
commit 6d0947d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.editorconfig b/.editorconfig
@@ -9,3 +9,7 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+# White space is important in code examples so we don't want to trim it
+[lib/__fixtures__/curriculum-helpers-javascript.ts]
+trim_trailing_whitespace = false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: psf/black@552baf822992936134cbd31a38f69c8cfe7c0f05 # v24.3.0
+      - uses: psf/black@8fe627072f15ff2e3d380887b92f7868efaf6d05 # 24.4.0
 
   tests:
     name: "Node CI"