test

RedTurtle · Sep 10, 2024 · 671d0e7 · 671d0e7
1 parent 31e28e4
commit 671d0e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -70,7 +70,6 @@
   - Add slate compatibility
 
 ## 20240723-01
->>>>>>> main
 - update redturtle.volto 5.5.0 -> 5.5.1
   - Allow to select which image miniature use in RSS [lucabel]
 

diff --git a/development.cfg b/development.cfg
@@ -17,10 +17,12 @@ parts +=
     site
     omelette
 allow-picked-versions = false
+custom-eggs +=
+    design.plone.policy
+    design.plone.contenttypes
 
 [instance]
 eggs +=
-    design.plone.policy
     collective.upgrade
 
 [site]