diff options
Reload data after resolving save conflict
After resolving a save conflict with the merge tool, we need to reload
the data files to import the result of the conflict resolution.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'build-aux%252525252525253fid%252525252525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9%2525252525253fid%2525252525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9%25252525253fid%25252525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9%252525253fid%252525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9%2525253fid%2525253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9&id2%2525253d2fe9c7efcee3812d46f367d3321c924ca4152485%25253fid%25253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9&id2%25253d2fe9c7efcee3812d46f367d3321c924ca4152485%253fid%253d8ab3106f6bd4967f145aeefdebe50a776c18c7b9%3fid%3d8ab3106f6bd4967f145aeefdebe50a776c18c7b9?id=2fe9c7efcee3812d46f367d3321c924ca4152485')
0 files changed, 0 insertions, 0 deletions