forgot to remove conflict indicators
authorGert Driesen <drieseng@users.sourceforge.net>
Tue, 1 Jun 2004 17:47:55 +0000 (17:47 -0000)
committerGert Driesen <drieseng@users.sourceforge.net>
Tue, 1 Jun 2004 17:47:55 +0000 (17:47 -0000)
commit33f3a435b511cf1ff996b99ce366da5d65597f3a
tree75230f4d85959c83a7bfc757e658517e616f5df1
parent8860a80e89f1e04288dc447cc8552d9dd8c9cc49
forgot to remove conflict indicators

svn path=/trunk/mcs/; revision=28641
mcs/class/corlib/System/ChangeLog