Merge branch 'main' into feat-global-local-access-grid-io

acts-project · Mar 21, 2024 · 30b4a6f · 30b4a6f
2 parents 3f0e7b4 + e9ea680
commit 30b4a6f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -154,7 +154,7 @@ familiar with development process in the Acts project.
 #. **Prefer git pull --rebase!**
 
    If you work with a colleague on a new
-   development, you may want to include his latest changes. This is
+   development, you may want to include their latest changes. This is
    usually done by calling ``git pull`` which will synchronise your
    local working copy with the remote repository (which may have been
    updated by your colleague). By default, this action creates a merge

diff --git a/docs/contribution/contribution.md b/docs/contribution/contribution.md
@@ -12,5 +12,4 @@ physmon
 root_hash_checks
 release
 profiling
-style_guide
 :::
diff --git a/docs/contribution/style_guide.md b/docs/contribution/style_guide.md