aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTE2
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE
index 5102b4fe4f1..a70682f29ab 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -183,7 +183,7 @@ intended for more-conservative changes such as bug fixes. Typically,
183collective development is active on the master branch and possibly on 183collective development is active on the master branch and possibly on
184the current release branch. Periodically, the current release branch 184the current release branch. Periodically, the current release branch
185is merged into the master, using the gitmerge function described in 185is merged into the master, using the gitmerge function described in
186admin/notes-git-workflow. 186admin/notes/git-workflow.
187 187
188If you are fixing a bug that exists in the current release, be sure to 188If you are fixing a bug that exists in the current release, be sure to
189commit it to the release branch; it will be merged to the master 189commit it to the release branch; it will be merged to the master