--- a/src/pyams_default_theme.egg-info/SOURCES.txt Fri Mar 16 08:15:58 2018 +0100
+++ b/src/pyams_default_theme.egg-info/SOURCES.txt Tue Mar 20 17:56:05 2018 +0100
@@ -3,12 +3,12 @@
docs/HISTORY.txt
docs/README.txt
src/pyams_default_theme/__init__.py
-src/pyams_default_theme/configuration.py
src/pyams_default_theme/include.py
src/pyams_default_theme/layer.py
src/pyams_default_theme/page.py
src/pyams_default_theme/skin.py
src/pyams_default_theme.egg-info/PKG-INFO
+src/pyams_default_theme.egg-info/SOURCES (Copie en conflit de xsup98-004 2018-03-10).txt
src/pyams_default_theme.egg-info/SOURCES.txt
src/pyams_default_theme.egg-info/dependency_links.txt
src/pyams_default_theme.egg-info/entry_points.txt
@@ -58,8 +58,10 @@
src/pyams_default_theme/resources/js/pyams-default.min.js
src/pyams_default_theme/resources/less/pyams-default.less
src/pyams_default_theme/shared/__init__.py
+src/pyams_default_theme/shared/common.py
src/pyams_default_theme/shared/logo/__init__.py
src/pyams_default_theme/shared/logo/templates/logos-default.pt
+src/pyams_default_theme/shared/templates/content-header.pt
src/pyams_default_theme/templates/index.pt
src/pyams_default_theme/templates/layout.pt
src/pyams_default_theme/tests/__init__.py