From e71965048e167737a7e6a5bae3d88c6e8e922afb Mon Sep 17 00:00:00 2001 From: andrfla Date: Sun, 9 Oct 2011 16:15:17 +0000 Subject: [PATCH] fixed commit bugs --- cli/worblehat.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/cli/worblehat.py b/cli/worblehat.py index 6058a06..94fa44a 100755 --- a/cli/worblehat.py +++ b/cli/worblehat.py @@ -367,17 +367,14 @@ def map_cmd(connection, shelfname=None, category=None): def suggest_book_data(connection, tmp_file=False): return google_suggest_book_data(connection, tmp_file) -<<<<<<< .mine def register_books(connection): filename = suggest_book_data(connection, tmp_file=True) run_editor(filename) commit(connection, filename) -======= def give_bananas(): print "Om nom nom... Thanks!" ->>>>>>> .r164 commands = { 'show': { 'args': [('ids', (1,None))], 'options': ['commit_format', 'tmp_file'],