Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc

wikipedia_to_hdoc/README.md

@@ -40,7 +40,6 @@ Generating .hdoc of a Wikipedia article with a local file
                        
 3 - Get the .hdoc in the output/source folder
 
-<<<<<<< HEAD
 To do
 ---------------------------------------------------------
 1 - Extract the metadata information from the meta.xml file for each image. You can do that by creating an XSL file that will be called from the ant task generated by xslt/get_ressources_urls.xsl. In that file you have the hand on each meta.xml File.
@@ -52,10 +51,8 @@ To do
 Be aware of the following things
 ---------------------------------------------------------
 1 - Not all images have a metadata information (only the ones who )
-=======
+2 - The title of the images have a metadata information (only the ones who are not included in the text)
 
 BUG
 ---
-
-1 - Linux sh files doesn't work with UTC proxy but works outside UTC
->>>>>>> 179e986aa2806c832d881e062b03b557fc6f77b2
+1 - Linux sh files doesn't work with UTC proxy but works outside UTC
\ No newline at end of file