fix slides xml

This commit is contained in:
Max Mehl 2021-06-21 16:17:51 +02:00
parent 35b2409fc3
commit afd91cdbc1
Signed by: max.mehl
GPG Key ID: 2704E4AB371E2E92
16 changed files with 1 additions and 221 deletions

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/conclusion.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/conclusion.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,11 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<meta name="author" content="Benoit Sibaud"/>
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/ethical.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/ethical.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/facts.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/facts.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/independence.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/independence.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/origin.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/origin.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>
@ -27,7 +11,7 @@
<ul>
<li>Idea of Pierre Jarillon, LSM &amp; ABUL president</li>
<li>January the 7th, 2002</li>
<li>Announce on <a href="http://www.april.org">APRIL</a>, <a href="/index.html">FSF France</a> and <a href="http://www.aful.org">AFUL</a> lists</li>
<li>Announce on <a href="http://www.april.org">APRIL</a>, <a href="/index.html">FSF France</a> and <a href="http://www.aful.org">AFUL</a> lists</li>
</ul>
<hr/>
<a href="plan.html">[Plan]</a>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/plan.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/plan.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/social.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/social.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/support.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/support.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/technical.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/technical.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,11 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<meta name="author" content="Benoit Sibaud"/>
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/unesco.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/unesco.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/why1.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/why1.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,11 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<meta name="author" content="Benoit Sibaud"/>
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/workdone.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/workdone.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>

View File

@ -3,23 +3,7 @@
<version>1</version>
<head>
<title>Libre software, patrimony of mankind</title>
<<<<<<< HEAD:activities/mankind/lsm2002/slides/workinprogress.xhtml
<meta name="author" content="Benoit Sibaud"/>
<<<<<<< HEAD
<meta name="description" lang="en" content="Libre software, patrimony of mankind"/>
=======
<link rel="stylesheet" type="text/css" href="lsm.css">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="author" content="Benoit Sibaud">
<meta name="description" lang="en" content="Libre software, patrimony of mankind">
>>>>>>> 6c9f4ae137 (remove all meta keyword elements):activities/mankind/lsm2002/slides/workinprogress.html
=======
>>>>>>> 0a65157e49 (replace meta-description element with separate element)
</head>
<body>