Merge branch 'master' into 2.x-dev

hydephp · Nov 10, 2024 · 4409adf · 4409adf
2 parents 90cb878 + dcba48a
commit 4409adf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1472,7 +1472,7 @@ However, if you are a package developer, or if you have published Blade views or
 
 ### Changed
 
-- Change the the Prettier integration to only modify HTML files https://github.com/hydephp/develop/issues/102
+- Change the Prettier integration to only modify HTML files https://github.com/hydephp/develop/issues/102
 - Change how the `docs/search.html` page is rendered, by handling page logic in the view, to decouple it from the build search command
 
 ### Fixed

diff --git a/resources/assets/app.js b/resources/assets/app.js
@@ -1,3 +1,3 @@
 /*
-* This is the main JavaScript used by webpack to build the the app.js file.
+* This is the main JavaScript used by webpack to build the app.js file.
 */