From a009d5234f4d8d903f2c20be1016d7b360cc134e Mon Sep 17 00:00:00 2001
From: Luca Bellenghi <lucabel@gmail.com>
Date: Wed, 10 Jul 2024 16:38:32 +0200
Subject: [PATCH] resolve conflicts

---
 base.cfg | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/base.cfg b/base.cfg
index e28f6f3..b7676a3 100644
--- a/base.cfg
+++ b/base.cfg
@@ -119,10 +119,6 @@ scripts =
 [versions]
 # Don't use a released version of redturtle.volto
 redturtle.volto =
-<<<<<<< HEAD
-setuptools = 69.0.0 
-=======
 setuptools = 
 
 [sources]
->>>>>>> master