fixed commit bugs

2011-10-09 16:15:17 +00:00 · 2011-10-09 16:15:17 +00:00 · e71965048e
commit e71965048e
parent 09e2bc414d
1 changed files with 0 additions and 3 deletions
--- 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'],