Projects/worblehat-old
Projects
/
worblehat-old
Archived
12
0
Fork 0
Code Issues Pull Requests Activity

fixed commit bugs

This commit is contained in:
Andreas Lindahl Flåten 2011-10-09 16:15:17 +00:00
parent 09e2bc414d
commit e71965048e
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/worblehat.py
View File

@ -367,17 +367,14 @@ def map_cmd(connection, shelfname=None, category=None):
def suggest_book_data(connection, tmp_file=False): def suggest_book_data(connection, tmp_file=False):
return google_suggest_book_data(connection, tmp_file) return google_suggest_book_data(connection, tmp_file)
<<<<<<< .mine
def register_books(connection): def register_books(connection):
filename = suggest_book_data(connection, tmp_file=True) filename = suggest_book_data(connection, tmp_file=True)
run_editor(filename) run_editor(filename)
commit(connection, filename) commit(connection, filename)
=======
def give_bananas(): def give_bananas():
print "Om nom nom... Thanks!" print "Om nom nom... Thanks!"
>>>>>>> .r164
commands = { 'show': commands = { 'show':
{ 'args': [('ids', (1,None))], { 'args': [('ids', (1,None))],
'options': ['commit_format', 'tmp_file'], 'options': ['commit_format', 'tmp_file'],