Removed the conflict identifier I left in...

This commit is contained in:
Marc Lehmann 1998-10-21 19:15:52 +00:00
parent 511f7c8046
commit adeae228ee

View file

@ -35,7 +35,6 @@ Tue Oct 20 23:20:40 BST 1998 Andy Thomas <alt@picnic.demon.co.uk>
Started to change some of the scripts to use the new widget types.
>>>>>>> 1.674
1998-10-19 Christopher James Lahey <clahey@umich.edu>
* app/docindex.c: New Drag & Drop works now.