# HG changeset patch
# User Damien Correia
# Date 1529309639 -7200
# Node ID 4815c9f22461fac5c05d34aed45f934861a88902
# Parent  34af60bf16838d9ce609842927cfbe4a29ce9b35# Parent  198b1598bb5004e8bc26e638c5972d24e61e18e3
merge default

diff -r 34af60bf1683 -r 4815c9f22461 src/pyams_utils/interfaces/site.py
--- a/src/pyams_utils/interfaces/site.py	Fri Jun 15 16:36:40 2018 +0200
+++ b/src/pyams_utils/interfaces/site.py	Mon Jun 18 10:13:59 2018 +0200
@@ -56,19 +56,5 @@
     """Configuration manager marker interface"""
 
 
-class IConfigurationFactory(Interface):
-    """Configuration factory interface
-
-    This factory may be loaded through an adapter
-    """
-
-
-class IBackOfficeConfigurationFactory(Interface):
-    """Back-office configuration factory interface
-
-    This factory may be loaded through an adapter
-    """
-
-
 class IOptionalUtility(Interface):
     """Marker interface for site utilities that can be removed"""
diff -r 34af60bf1683 -r 4815c9f22461 src/pyams_utils/site.py
--- a/src/pyams_utils/site.py	Fri Jun 15 16:36:40 2018 +0200
+++ b/src/pyams_utils/site.py	Mon Jun 18 10:13:59 2018 +0200
@@ -20,7 +20,6 @@
     PYAMS_APPLICATION_FACTORY_KEY, PUBLIC_PERMISSION
 from pyams_utils.interfaces.site import ISiteRoot, ISiteRootFactory, INewLocalSiteCreatedEvent, ISiteUpgradeEvent, \
     ISiteGenerations, SITE_GENERATIONS_KEY, IConfigurationManager
-from zope.annotation.interfaces import IAnnotations
 from zope.component.interfaces import IPossibleSite, ObjectEvent
 from zope.traversing.interfaces import ITraversable