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