<svn_revision>
<text_version>
Origine: file:///home/svn/repository/spip-zone/_plugins_/yaml
+<<<<<<< HEAD
+Revision: 74084
+Dernier commit: 2013-07-05 13:00:07 +0200
+</text_version>
+<origine>file:///home/svn/repository/spip-zone/_plugins_/yaml</origine>
+<revision>74084</revision>
+<commit>2013-07-05 13:00:07 +0200 </commit>
+=======
Revision: 78336
Dernier commit: 2013-11-11 00:00:50 +0100
</text_version>
<origine>file:///home/svn/repository/spip-zone/_plugins_/yaml</origine>
<revision>78336</revision>
<commit>2013-11-11 00:00:50 +0100 </commit>
+>>>>>>> v1
</svn_revision>
\ No newline at end of file