gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Cleanup

Browse Source 
- Removed git conflict marker (thanks to Uli Martens).
This commit is contained in:
Paul Beckingham
2012-01-12 01:06:26 -05:00
parent 71a15f9d44
commit 205d4fe29f
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DEVELOPER
View File

@@ -130,13 +130,8 @@ Current Codebase Condition
--- ---
<<<<<<< HEAD
2012-01-10 Removed entry for extractLines, which was rewritten. 2012-01-10 Removed entry for extractLines, which was rewritten.
2012-01-07 Removed entry for export-sql.yy. Example exists now. 2012-01-07 Removed entry for export-sql.yy. Example exists now.
||||||| merged common ancestors
=======
2012-01-07 Removed entry for export-sql.yy. Example exists now.
>>>>>>> 76e87173e1f9c490e4148346f6b9fdd47e2da6d5
2011-12-31 Added note about bad unit tests at EOY. 2011-12-31 Added note about bad unit tests at EOY.
2011-12-23 Removed entry for tree-indentation function. 2011-12-23 Removed entry for tree-indentation function.
2011-10-16 Removed obsolete entries, added test suite description. 2011-10-16 Removed obsolete entries, added test suite description.