X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=Changes;h=68be427915f2ba81d3901b1852b897befe8c168a;hb=30788e921ae7fb6ca54f043d21f154bfd884dcc6;hp=824457049172dfb729473276db410bec4eed89af;hpb=2f4355fb63f336cce61887b189d5556faf1734d7;p=spider.git

diff --git a/Changes b/Changes
index 82445704..68be4279 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+29Jun99=======================================================================
+1. fixed merge command that I broke.
 28Jun99=======================================================================
 1. console.pl now works with history and editting.
 2. added scrolling to stuff sent by the cluster.