Added a comment
[ikiwiki] / doc / bugs / conflicts.mdwn
2010-08-27  Jonas SmedegaardMerge branch 'master' of git://git.ikiwiki.info
2010-07-18  Joey HessMerge remote branch 'intrigeri/po'
2010-07-18  Joey HessMerge branch 'master' of ssh://git.ikiwiki.info/srv...
2010-07-18  Joey Hessfix other 2 cases of conflicting destdir files
2010-07-18  Joey Hessclass of bugs I am working on