[gnucash/f17] More merge fixing

[Bill Nottingham]

commit 295373c49af2112173eb2c784ad5da339157c676
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Jul 13 15:15:25 2012 -0400

    More merge fixing

 gnucash-tip.patch |   24 ------------------------
 1 files changed, 0 insertions(+), 24 deletions(-)