Merge branch 'v1'
[lhc/web/www.git] / www / plugins / yaml / svn.revision
1 <svn_revision>
2 <text_version>
3 Origine: file:///home/svn/repository/spip-zone/_plugins_/yaml
4 <<<<<<< HEAD
5 Revision: 74084
6 Dernier commit: 2013-07-05 13:00:07 +0200
7 </text_version>
8 <origine>file:///home/svn/repository/spip-zone/_plugins_/yaml</origine>
9 <revision>74084</revision>
10 <commit>2013-07-05 13:00:07 +0200 </commit>
11 =======
12 Revision: 78336
13 Dernier commit: 2013-11-11 00:00:50 +0100
14 </text_version>
15 <origine>file:///home/svn/repository/spip-zone/_plugins_/yaml</origine>
16 <revision>78336</revision>
17 <commit>2013-11-11 00:00:50 +0100 </commit>
18 >>>>>>> v1
19 </svn_revision>