Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@luca-bellenghi
luca-bellenghi committed Jul 10, 2024
1 parent 38476de commit a009d52
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions base.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit a009d52

Please sign in to comment.