Skip to content
Browse files

Allow for metadata in markdown documents

  • Loading branch information...
1 parent fb52776 commit 49a0cf75dce749e57de9da074100759b2779249f Simon Metson committed Apr 4, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 push_chapters.py
View
4 push_chapters.py
@@ -36,8 +36,12 @@ def build(doc):
print "Could not parse metadata, invalid json?: %s" % m
content = "".join(filter(lambda x: not x.startswith('%%%'), md))
jdoc = {'_id': doc.strip('.md'), 'content': content}
+<<<<<<< HEAD
if meta:
jdoc['meta'] = meta
+=======
+ jdoc.update(meta)
+>>>>>>> 419df19... Allow for metadata in markdown documents
f.close()
return jdoc

0 comments on commit 49a0cf7

Please sign in to comment.
Something went wrong with that request. Please try again.