Minor changes
This commit is contained in:
42
index.html
42
index.html
@@ -3,11 +3,7 @@
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr">
|
||||
<head>
|
||||
<<<<<<< HEAD
|
||||
<!-- 2018-05-29 mar. 23:49 -->
|
||||
=======
|
||||
<!-- 2018-05-29 mar. 23:46 -->
|
||||
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
|
||||
<!-- 2018-05-29 mar. 23:52 -->
|
||||
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title>Ressources grammaticales des langues construites de P’undrak</title>
|
||||
@@ -244,25 +240,15 @@ for the JavaScript code in this tag.
|
||||
<h2>Table des matières</h2>
|
||||
<div id="text-table-of-contents">
|
||||
<ul>
|
||||
<<<<<<< HEAD
|
||||
<li><a href="#org43d2def">1. Hjalpi’</a></li>
|
||||
<li><a href="#org5518b8e">2. Draconian</a></li>
|
||||
=======
|
||||
<li><a href="#orge3ea773">1. Hjalpi’</a></li>
|
||||
<li><a href="#orgdb7631b">2. Draconian</a></li>
|
||||
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
|
||||
<li><a href="#org5913eab">1. Hjalpi’</a></li>
|
||||
<li><a href="#org3c4c221">2. Draconian</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<a href="https://github.com/Phundrak/langue-phundrak-fr"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub!"></a>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<div id="outline-container-org43d2def" class="outline-2">
|
||||
<h2 id="org43d2def"><span class="section-number-2">1</span> Hjalpi’</h2>
|
||||
=======
|
||||
<div id="outline-container-orge3ea773" class="outline-2">
|
||||
<h2 id="orge3ea773"><span class="section-number-2">1</span> Hjalpi’</h2>
|
||||
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
|
||||
<div id="outline-container-org5913eab" class="outline-2">
|
||||
<h2 id="org5913eab"><span class="section-number-2">1</span> Hjalpi’</h2>
|
||||
<div class="outline-text-2" id="text-1">
|
||||
<p>
|
||||
🔵 <a href="hjalpi/index.html">Hjalpi’ Originel</a> (en cours)
|
||||
@@ -274,22 +260,14 @@ for the JavaScript code in this tag.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<div id="outline-container-org5518b8e" class="outline-2">
|
||||
<h2 id="org5518b8e"><span class="section-number-2">2</span> Draconian</h2>
|
||||
<div id="outline-container-org3c4c221" class="outline-2">
|
||||
<h2 id="org3c4c221"><span class="section-number-2">2</span> Draconian</h2>
|
||||
<div class="outline-text-2" id="text-2">
|
||||
<p>
|
||||
🔵 <a href="draconian/auto-generated-draft.html">Łijökken</a> (en cours)
|
||||
</p>
|
||||
|
||||
<p>
|
||||
=======
|
||||
<div id="outline-container-orgdb7631b" class="outline-2">
|
||||
<h2 id="orgdb7631b"><span class="section-number-2">2</span> Draconian</h2>
|
||||
<div class="outline-text-2" id="text-2">
|
||||
<p>
|
||||
🔵 <a href="draconian/auto-generated-draft.html">Łijökken</a> (en cours)
|
||||
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
|
||||
🔵 <a href="draconian-2/index.html">Zöhæň</a> (en cours)
|
||||
</p>
|
||||
</div>
|
||||
@@ -297,11 +275,7 @@ for the JavaScript code in this tag.
|
||||
</div>
|
||||
<div id="postamble" class="status">
|
||||
<p class="author">Auteur: Lucien Cartier-Tilet</p>
|
||||
<<<<<<< HEAD
|
||||
<p class="date">Created: 2018-05-29 mar. 23:49</p>
|
||||
=======
|
||||
<p class="date">Created: 2018-05-29 mar. 23:46</p>
|
||||
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
|
||||
<p class="date">Created: 2018-05-29 mar. 23:52</p>
|
||||
<p class="validation"></p>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
Reference in New Issue
Block a user