--- a/src/pyams_skin.egg-info/SOURCES.txt	Tue Mar 20 13:43:15 2018 +0100
+++ b/src/pyams_skin.egg-info/SOURCES.txt	Tue Mar 20 17:41:53 2018 +0100
@@ -19,6 +19,7 @@
 src/pyams_skin/table.py
 src/pyams_skin/vocabulary.py
 src/pyams_skin.egg-info/PKG-INFO
+src/pyams_skin.egg-info/SOURCES (Copie en conflit de xsup98-004 2018-03-10).txt
 src/pyams_skin.egg-info/SOURCES.txt
 src/pyams_skin.egg-info/dependency_links.txt
 src/pyams_skin.egg-info/entry_points.txt
@@ -444,6 +445,7 @@
 src/pyams_skin/resources/js/ext/bootstrap-modalmanager.js
 src/pyams_skin/resources/js/ext/bootstrap-modalmanager.min.js
 src/pyams_skin/resources/js/ext/bootstrap-progressbar-0.6.0.js
+src/pyams_skin/resources/js/ext/bootstrap-progressbar-0.6.0.min.js
 src/pyams_skin/resources/js/ext/bootstrap-slider-2.0.0.js
 src/pyams_skin/resources/js/ext/bootstrap-slider-2.0.0.min.js
 src/pyams_skin/resources/js/ext/bootstrap-treeview.js
@@ -515,7 +517,6 @@
 src/pyams_skin/resources/js/ext/jquery-scrollTo.min.js
 src/pyams_skin/resources/js/ext/jquery-select2-3.5.4.js
 src/pyams_skin/resources/js/ext/jquery-select2-3.5.4.min.js
-src/pyams_skin/resources/js/ext/jquery-select2-3.5.4.min.min.js
 src/pyams_skin/resources/js/ext/jquery-select2-sortable.js
 src/pyams_skin/resources/js/ext/jquery-select2-sortable.min.js
 src/pyams_skin/resources/js/ext/jquery-smartclick.js
@@ -1163,7 +1164,6 @@
 src/pyams_skin/resources/less/apps/todo.less
 src/pyams_skin/resources/less/css/gis.css
 src/pyams_skin/resources/less/css/gis.min.css
-src/pyams_skin/resources/less/css/gis.min.min.css
 src/pyams_skin/resources/less/ext/jquery-dndupload.less
 src/pyams_skin/templates/container.pt
 src/pyams_skin/templates/header.pt