aboutsummaryrefslogtreecommitdiffstats
path: root/doc/versioning.md
diff options
context:
space:
mode:
authorMark Russell <mruss660@gmail.com>2021-09-16 16:20:39 -0400
committerMark Russell <mruss660@gmail.com>2021-09-16 16:20:39 -0400
commitb9e56843a29672b2befa65bf036f6db21078291f (patch)
treec2fa91e352127c09abd0f9b4959cd1f47d628ea8 /doc/versioning.md
parentcdf99b08f42c3826a8608d756bc7cda0a476ed98 (diff)
parent3eb73774a39e255cd4b5de76441a59f1525a989c (diff)
resolve conflict in src/systemtask/Messages.h
Diffstat (limited to 'doc/versioning.md')
-rw-r--r--doc/versioning.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/versioning.md b/doc/versioning.md
index b08af714..48e05043 100644
--- a/doc/versioning.md
+++ b/doc/versioning.md
@@ -3,4 +3,4 @@ The versioning of this project is based on [Semantic versionning](https://semver
- The **patch** is incremented when we fix a bug on a **released** version (most of the time using a **hotfix** branch).
- The **minor** is incremented when we release a new version with new features. It corresponds to a merge of **develop** into **master**.
- - The **major** should be incremented when a breaking change is made to the application. We still have to define what is a breaking change in the context of this project. For now, I suggest that it stays **0** until we have a fully functionning firmware suited for the final user. \ No newline at end of file
+ - The **major** should be incremented when a breaking change is made to the application. We still have to define what is a breaking change in the context of this project. For now, I suggest that it stays **0** until we have a fully functioning firmware suited for the final user. \ No newline at end of file