#
# ChangeLog for trunk/subversion/conflict.fig
#
# Generated by Trac 1.0.1
# 07/14/24 10:43:38

Mon, 09 Jan 2006 17:59:47 GMT nanardon [39]
	* trunk/subversion/Makefile (modified)
	* trunk/subversion/conflict.fig (added)
	* trunk/subversion/subversion.tex (modified)

	- add conflict slide