remove some old merge leftovers

This commit is contained in:
Colin Kuskie 2008-12-01 05:40:41 +00:00
parent f61b2222ae
commit 3999399d4d

View file

@ -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