Merge branch 'v1'

[lhc/web/www.git] / www / plugins / yaml / svn.revision

diff --git a/www/plugins/yaml/svn.revision b/www/plugins/yaml/svn.revision
index 4de689b..8e5bfb6 100644 (file)
--- a/www/plugins/yaml/svn.revision
+++ b/www/plugins/yaml/svn.revision
@@ -1,10 +1,19 @@
 <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