Merge branch 'master' of github.com:Phundrak/langue-phundrak-fr

This commit is contained in:
Phuntsok Drak-pa
2018-05-29 23:51:13 +02:00
4 changed files with 64 additions and 0 deletions

View File

@@ -3,7 +3,11 @@
"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:44 -->
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Ressources grammaticales du Zöhæň</title>
@@ -180,12 +184,15 @@
.org-svg { width: 90%; }
/*]]>*/-->
</style>
<<<<<<< HEAD
<link rel="stylesheet" type="text/css" href="https://www.pirilampo.org/styles/readtheorg/css/htmlize.css"/>
<link rel="stylesheet" type="text/css" href="https://www.pirilampo.org/styles/readtheorg/css/readtheorg.css"/>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://www.pirilampo.org/styles/lib/js/jquery.stickytableheaders.min.js"></script>
<script type="text/javascript" src="https://www.pirilampo.org/styles/readtheorg/js/readtheorg.js"></script>
=======
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<script type="text/javascript">
/*
@licstart The following is the entire license notice for the
@@ -240,16 +247,27 @@ for the JavaScript code in this tag.
<h2>Table des matières</h2>
<div id="text-table-of-contents">
<ul>
<<<<<<< HEAD
<li><a href="#orgf32cbff">1. Grammaire</a></li>
<li><a href="#org82cd81e">2. Lexique</a></li>
<li><a href="#org73bc785">3. Autre</a></li>
=======
<li><a href="#org909ddaa">1. Grammaire</a></li>
<li><a href="#org2f259f1">2. Lexique</a></li>
<li><a href="#orgbdcd0d0">3. Autre</a></li>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
</ul>
</div>
</div>
<<<<<<< HEAD
<div id="outline-container-orgf32cbff" class="outline-2">
<h2 id="orgf32cbff"><span class="section-number-2">1</span> Grammaire</h2>
=======
<div id="outline-container-org909ddaa" class="outline-2">
<h2 id="org909ddaa"><span class="section-number-2">1</span> Grammaire</h2>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<div class="outline-text-2" id="text-1">
<p>
<a href="grammaire.html">Grammaire du Zöhæň</a> (<a href="grammaire.pdf">pdf</a>)
@@ -257,17 +275,30 @@ for the JavaScript code in this tag.
</div>
</div>
<<<<<<< HEAD
<div id="outline-container-org82cd81e" class="outline-2">
<h2 id="org82cd81e"><span class="section-number-2">2</span> Lexique</h2>
</div>
<div id="outline-container-org73bc785" class="outline-2">
<h2 id="org73bc785"><span class="section-number-2">3</span> Autre</h2>
=======
<div id="outline-container-org2f259f1" class="outline-2">
<h2 id="org2f259f1"><span class="section-number-2">2</span> Lexique</h2>
</div>
<div id="outline-container-orgbdcd0d0" class="outline-2">
<h2 id="orgbdcd0d0"><span class="section-number-2">3</span> Autre</h2>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
</div>
</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:44</p>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<p class="validation"></p>
</div>
</body>