GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge Errors

Browse source 
- Fixed errors from merge mistakes.
This commit is contained in:
Paul Beckingham 2014-01-07 19:23:54 -05:00
parent 98f740e9d1
commit 9c41610f56
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/columns/ColDate.cpp
View file

@ -125,7 +125,7 @@ void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maxim
{
Date now;
if (date > now)
minimum = maximum = Duration (date - now).format ().length ();
minimum = maximum = OldDuration (date - now).format ().length ();
}
else
throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
@ -207,7 +207,7 @@ void ColumnDate::render (
lines.push_back (
color.colorize (
rightJustify (
Duration (date - now).format (), width)));
OldDuration (date - now).format (), width)));
else
lines.push_back ("");
}