aboutsummaryrefslogtreecommitdiff
path: root/config/version.txt
diff options
context:
space:
mode:
authorMinteck <contact@minteck.org>2022-01-19 17:42:09 +0100
committerMinteck <contact@minteck.org>2022-01-19 17:42:09 +0100
commit2e941de83bb3f3b00565a203df3657e416a9e1d0 (patch)
tree6e52fdf355373066264952f82ee223167fab84fa /config/version.txt
parente0d933d5734e331c15a299c50c22ec06171a914f (diff)
downloadponyfind-2e941de83bb3f3b00565a203df3657e416a9e1d0.tar.gz
ponyfind-2e941de83bb3f3b00565a203df3657e416a9e1d0.tar.bz2
ponyfind-2e941de83bb3f3b00565a203df3657e416a9e1d0.zip
Update
Diffstat (limited to 'config/version.txt')
-rw-r--r--config/version.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/config/version.txt b/config/version.txt
index 19b268e..925a2b1 100644
--- a/config/version.txt
+++ b/config/version.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0.8.22
-=======
-0.8.23
->>>>>>> 4be58e9d499e2f2610c179520241b3329b8a622f
+0.8.24 \ No newline at end of file