From 3999399d4d1b235b9f310e604b8e2b4edd369b93 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 1 Dec 2008 05:40:41 +0000 Subject: [PATCH] remove some old merge leftovers --- docs/changelog/7.x.x.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 068f5013a..da2974d5f 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -97,7 +97,6 @@ - fixed #8822: Password Recovery Tempalte not working - fixed: DataForm times out when exporting large data sets - fixed: DataForm entry data field is too small ->>>>>>> .merge-right.r8665 7.6.3