remove conflicts
authorChris Elliott <biol75@york.ac.uk>
Thu, 26 Jun 2003 11:22:50 +0000 (11:22 +0000)
committerChris Elliott <biol75@york.ac.uk>
Thu, 26 Jun 2003 11:22:50 +0000 (11:22 +0000)
commitdf2309bac7bdde54885189af0eaac46d8735d3f8
tree92b9ae1daf74e8b06c05470925fd8386ba07a8ea
parent034957673ccd2006aee3937c5b86245e51d4bf62
remove conflicts

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
src/makelib.wat