# 
# patch "ChangeLog"
#  from [d2647fc2f7eadc4e8ec5e85ee22e9ccc5fd7e8df]
#    to [c8abb5b59ede114b87fa7de2275d908db18db297]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 2005-04-24  Nathaniel Smith  <address@hidden>
 
+	* ChangeLog: Fixup after merge.
+
+2005-04-24  Nathaniel Smith  <address@hidden>
+
 	* manifest.cc (build_restricted_manifest_map): Careful to only
 	stat things once on the inodeprints fast-path.
 	(read_manifest_map): Hand-code a parser, instead of using
@@ -8,8 +12,6 @@
 
 2005-04-23  Derek Scherger  <address@hidden>
 
-2005-04-23  Derek Scherger  <address@hidden>
-
 	* (calculate_restricted_revision): remove redundant variables,
 	avoiding path_rearrangement assignments and associated sanity
 	checks