Fixes small errors in merge files.
authorStéphane Jacob <sj@m4x.org>
Fri, 15 Oct 2010 16:16:54 +0000 (18:16 +0200)
committerStéphane Jacob <sj@m4x.org>
Fri, 15 Oct 2010 16:16:54 +0000 (18:16 +0200)
commitee120a763df0ab85e0b86e7e9e1b0d216d949043
treec558fbad38031fa1dd702eb7900a667e6bae02b1
parent09b461cecabea452483ae3e9e9ed28f43594ec26
Fixes small errors in merge files.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
templates/fusionax/index.tpl
upgrade/1.0.1/15_merge_issues.sql