minor chnges for conflict removal

This commit is contained in:
alexandre benoit
2013-04-29 15:12:44 +02:00
parent 16dea7b90d
commit 9549949228
6 changed files with 17 additions and 18 deletions

View File

@@ -7,6 +7,6 @@
.. |Author_ArtemM| unicode:: Artem U+0020 Myagkov
.. |Author_FernandoI| unicode:: Fernando U+0020 Iglesias U+0020 Garc U+00ED a
.. |Author_EduardF| unicode:: Eduard U+0020 Feicho
.. |Author_AlexB| unicode:: Alexandre U+0020 Benoit
.. |Author_AlexB| unicode:: Alexandre U+0020 Benoit