aboutsummaryrefslogtreecommitdiff
path: root/config/version.txt
diff options
context:
space:
mode:
Diffstat (limited to 'config/version.txt')
-rw-r--r--config/version.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/version.txt b/config/version.txt
index cddd48a..19b268e 100644
--- a/config/version.txt
+++ b/config/version.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
+0.8.22
+=======
0.8.23
+>>>>>>> 4be58e9d499e2f2610c179520241b3329b8a622f