summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorYobmod <yobmod@gmail.com>2021-06-17 17:29:37 +0100
committerYobmod <yobmod@gmail.com>2021-06-17 17:29:37 +0100
commit636f77bf8d58a482df0bde8c0a6a8828950a0788 (patch)
treee1207dbe034f82deacbb76369716779608e7056d /VERSION
parent567c892322776756e8d0095e89f39b25b9b01bc2 (diff)
parentb0f79c58ad919e90261d1e332df79a4ad0bc40de (diff)
downloadgitpython-636f77bf8d58a482df0bde8c0a6a8828950a0788.tar.gz
fix conflict
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 3797f3f9..5762a6ff 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.17
+3.1.18