Code Cleanup

- Removed deprecated 'push', 'pull' and 'merge' commands.
2014-01-18 19:12:48 -05:00
parent 341c2fb474
commit 8b736934d7
47 changed files with 22 additions and 3941 deletions
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -103,7 +103,6 @@ public:
  void add (Task&, bool add_to_backlog = true);
  void modify (Task&, bool add_to_backlog = true);
  void commit ();
-  void merge (const std::string&);
  void revert ();
  int  gc ();
  int  next_id ();