Allow for metadata in markdown documents

drsm79 · Apr 4, 2012 · 49a0cf7 · 49a0cf7
1 parent fb52776
commit 49a0cf7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/push_chapters.py b/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