fixed previous checkin

1998-09-29 15:26:03 +00:00 · 1998-09-29 15:26:03 +00:00 · 5a98d0b98f
--- a/widget/public/MANIFEST
+++ b/widget/public/MANIFEST
@ -29,7 +29,6 @@ nsIDialog.h
 nsILabel.h
 nsILookAndFeel.h
 nsWidgetSupport.h
-<<<<<<< MANIFEST
 nsIMenu.h
 nsIMenuBar.h
 nsIMenuButton.h