--- a/src/pyams_default_theme.egg-info/SOURCES.txt	Fri Jul 20 11:07:45 2018 +0200
+++ b/src/pyams_default_theme.egg-info/SOURCES.txt	Fri Jul 20 13:00:03 2018 +0200
@@ -8,6 +8,7 @@
 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
@@ -21,7 +22,6 @@
 src/pyams_default_theme/component/gallery/__init__.py
 src/pyams_default_theme/component/gallery/templates/renderer-default.pt
 src/pyams_default_theme/component/illustration/__init__.py
-src/pyams_default_theme/component/illustration/__init__.py.orig
 src/pyams_default_theme/component/illustration/interfaces/__init__.py
 src/pyams_default_theme/component/illustration/templates/illustration-default.pt
 src/pyams_default_theme/component/illustration/templates/illustration-left.pt
@@ -31,35 +31,51 @@
 src/pyams_default_theme/component/keynumber/portlet/templates/horizontal-render.pt
 src/pyams_default_theme/component/keynumber/portlet/templates/vertical-render.pt
 src/pyams_default_theme/component/paragraph/__init__.py
+src/pyams_default_theme/component/paragraph/audio.py
 src/pyams_default_theme/component/paragraph/contact.py
 src/pyams_default_theme/component/paragraph/frame.py
 src/pyams_default_theme/component/paragraph/header.py
 src/pyams_default_theme/component/paragraph/html.py
+src/pyams_default_theme/component/paragraph/keynumber.py
 src/pyams_default_theme/component/paragraph/keypoint.py
+src/pyams_default_theme/component/paragraph/map.py
+src/pyams_default_theme/component/paragraph/milestone.py
+src/pyams_default_theme/component/paragraph/pictogram.py
 src/pyams_default_theme/component/paragraph/verbatim.py
 src/pyams_default_theme/component/paragraph/video.py
 src/pyams_default_theme/component/paragraph/interfaces/__init__.py
 src/pyams_default_theme/component/paragraph/interfaces/contact.py
 src/pyams_default_theme/component/paragraph/interfaces/frame.py
+src/pyams_default_theme/component/paragraph/interfaces/map.py
 src/pyams_default_theme/component/paragraph/interfaces/verbatim.py
+src/pyams_default_theme/component/paragraph/templates/audio-default.pt
 src/pyams_default_theme/component/paragraph/templates/contact-default.pt
-src/pyams_default_theme/component/paragraph/templates/contact-default.pt.orig
 src/pyams_default_theme/component/paragraph/templates/frame-default.pt
 src/pyams_default_theme/component/paragraph/templates/frame-left.pt
 src/pyams_default_theme/component/paragraph/templates/frame-right.pt
 src/pyams_default_theme/component/paragraph/templates/header-default.pt
 src/pyams_default_theme/component/paragraph/templates/html-default.pt
+src/pyams_default_theme/component/paragraph/templates/keynumber-default.pt
 src/pyams_default_theme/component/paragraph/templates/keypoints-default.pt
+src/pyams_default_theme/component/paragraph/templates/map-default.pt
+src/pyams_default_theme/component/paragraph/templates/milestone-default.pt
+src/pyams_default_theme/component/paragraph/templates/pictogram-default.pt
 src/pyams_default_theme/component/paragraph/templates/raw-default.pt
 src/pyams_default_theme/component/paragraph/templates/verbatim-default.pt
 src/pyams_default_theme/component/paragraph/templates/verbatim-left.pt
 src/pyams_default_theme/component/paragraph/templates/verbatim-right.pt
 src/pyams_default_theme/component/paragraph/templates/video-default.pt
+src/pyams_default_theme/component/paragraph/zmi/__init__.py
+src/pyams_default_theme/component/paragraph/zmi/map.py
 src/pyams_default_theme/component/video/__init__.py
-src/pyams_default_theme/component/video/templates/video-default.pt
+src/pyams_default_theme/component/video/templates/external-video-default.pt
 src/pyams_default_theme/doctests/README.txt
 src/pyams_default_theme/features/__init__.py
 src/pyams_default_theme/features/footer/__init__.py
+src/pyams_default_theme/features/footer/interfaces.py
+src/pyams_default_theme/features/footer/skin/__init__.py
+src/pyams_default_theme/features/footer/skin/templates/simple-footer.pt
+src/pyams_default_theme/features/footer/zmi/__init__.py
 src/pyams_default_theme/features/header/__init__.py
 src/pyams_default_theme/features/header/interfaces.py
 src/pyams_default_theme/features/header/skin/__init__.py
@@ -71,13 +87,11 @@
 src/pyams_default_theme/features/menu/portlet/navigation/interfaces.py
 src/pyams_default_theme/features/menu/portlet/navigation/templates/double-select.pt
 src/pyams_default_theme/features/menu/portlet/navigation/templates/double-vertical.pt
-src/pyams_default_theme/features/menu/portlet/navigation/templates/onf.pt
 src/pyams_default_theme/features/menu/portlet/navigation/templates/simple-horizontal-tabs.pt
 src/pyams_default_theme/features/menu/portlet/navigation/templates/simple-horizontal.pt
 src/pyams_default_theme/interfaces/__init__.py
 src/pyams_default_theme/locales/pyams_default_theme.pot
 src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.mo
-src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.mo.orig
 src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.po
 src/pyams_default_theme/resources/css/pyams-default.css
 src/pyams_default_theme/resources/css/pyams-default.css.map