summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@calcurse.org>2017-09-08 21:02:18 +0200
committerLukas Fleischer <lfleischer@calcurse.org>2017-09-08 21:23:25 +0200
commit2fe9c7efcee3812d46f367d3321c924ca4152485 (patch)
tree649ee29fd702e7987f1a00240b88952e24c7c55c /.travis.yml
parente943a8a4dbb8b5d6ad280ba2a576cdd9e7e66a63 (diff)
downloadcalcurse-2fe9c7efcee3812d46f367d3321c924ca4152485.tar.gz
calcurse-2fe9c7efcee3812d46f367d3321c924ca4152485.zip
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 '.travis.yml')
0 files changed, 0 insertions, 0 deletions