delete garbage

svn path=/trunk/mcs/; revision=13354

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 656998e5f12318760471ef998b1862e1602b3a07..17fe52b5b3fa4c1f9bba6312b76d10b4001a9adf 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -12,7 +12,6 @@
 
        * cs-tokenizer.cs: little fixes to line numbering when #line is used.
 
->>>>>>> 1.953
 2003-01-18  Zoltan Varga  <vargaz@freemail.hu>
 
        * class.cs (Constructor::Emit): Emit debugging info for constructors.