Skip to content

Commit

Permalink
Fixed failmerge
Browse files Browse the repository at this point in the history
  • Loading branch information
ilammy committed Nov 30, 2013
1 parent 31ce923 commit a36d034
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
7 changes: 7 additions & 0 deletions epub/META-INF/container.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
<rootfiles>
<rootfile full-path="OEBPS/!lisp.opf"
media-type="application/oebps-package+xml" />
</rootfiles>
</container>
1 change: 1 addition & 0 deletions epub/mimetype
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
application/epub+zip

0 comments on commit a36d034

Please sign in to comment.