# 
# patch "ChangeLog"
#  from [de1eecdc63f7ec17f696e556669df261779da114]
#    to [13540d1b349bcded256bce2952358c4cac0b9d86]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,4 +1,7 @@
 2005-04-16  Nathaniel Smith  <address@hidden>
+
+	* ChangeLog: Fixup after merge.
+
 2005-04-16  Emile Snyder <address@hidden>
 
 	* tests/t_add_vs_commit.at: New test for failing case.  If you