]> git.mjollnir.org Git - moodle.git/commit
Add info for correcting conflicts
authormartignoni <martignoni>
Thu, 8 Jul 2004 09:08:49 +0000 (09:08 +0000)
committermartignoni <martignoni>
Thu, 8 Jul 2004 09:08:49 +0000 (09:08 +0000)
commita8bfd8afe974126d726e6cc60cfab075795192e8
tree04e2d82e5f5c97b28f06c3de45ff48f556ee9be9
parent60d37a2d0f4732242639f9e57b97c0830428d336
Add info for correcting conflicts
lang/fr/docs/cvs.html