Skip to content

Commit

Permalink
Merge branch 'master' of git@syrec.org:repo/repub
Browse files Browse the repository at this point in the history
Conflicts:
	lib/repub/app/options.rb
	lib/repub/app/parser.rb
  • Loading branch information
Dmitri Goutnik committed Jun 27, 2009
2 parents 786411f + d0581a8 commit ed3e8b3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.txt
@@ -1,6 +1,6 @@
== DESCRIPTION:

RePub is a simple HTML to ePub converter.
Repub is a simple HTML to ePub converter.

== FEATURES/PROBLEMS:

Expand Down
1 change: 1 addition & 0 deletions lib/repub/app.rb
Expand Up @@ -26,6 +26,7 @@ def self.data_path

def run(args)
parse_options(args)
exit

log.level = options[:verbosity]
log.info "Making ePub from #{options[:url]}"
Expand Down
2 changes: 1 addition & 1 deletion test/test_builder.rb
Expand Up @@ -3,6 +3,6 @@

class TestBuilder < Test::Unit::TestCase
def test_builder
flunk("todo")
# TODO
end
end

0 comments on commit ed3e8b3

Please sign in to comment.