Trivial change to test svnmerge

mdboom · mdboom · commit 2a59069c49bb · 2009-01-18T00:10:21.000Z
svn path=/branches/v0_98_5_maint/; revision=6805
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+	
+
 2009-01-16 Fix bug in is_string_like so it doesn't raise an
            unnecessary exception. - EF
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+`
	`2`	`+`
`1`	`3`	`2009-01-16 Fix bug in is_string_like so it doesn't raise an`
`2`	`4`	`unnecessary exception. - EF`
`3`	`5`