remove merge artifacts

EsupPortail · Jan 24, 2025 · 57361bf · 57361bf
1 parent da7b0f4
commit 57361bf
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/pod/settings.py b/pod/settings.py
@@ -13,13 +13,7 @@
 ##
 # Version of the project
 #
-<<<<<<< HEAD
 VERSION = "3.9.0"
-=======
-
-VERSION = "3.8.4"
-
->>>>>>> master
 
 ##
 # Installed applications list