diff options
Diffstat (limited to 'doc/version.texi')
| -rw-r--r-- | doc/version.texi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/version.texi b/doc/version.texi index cc70a06..e2494e1 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,9 @@ @set UPDATED 9 October 2016 @set UPDATED-MONTH October 2016 +<<<<<<< Updated upstream @set EDITION 0.10.1 @set VERSION 0.10.1 +======= +@set EDITION 0.10.0 +@set VERSION 0.10.0 +>>>>>>> Stashed changes |