Continue merge.

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -75,7 +75,7 @@ class CombinedOpenEndedFields(object):
     weight = StringyFloat(display_name="Problem Weight",
         help="The number of points the problem is worth. By default, each problem is worth one point.",
         scope=Scope.settings, values = {"min" : 0 , "step": ".1"})
-    markdown = String(help="Markdown source of this module", default="", scope=Scope.settings)
+    markdown = String(help="Markdown source of this module", scope=Scope.settings)
 
 
 class CombinedOpenEndedModule(CombinedOpenEndedFields, XModule):

common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml

@@ -1,6 +1,7 @@
 ---
 metadata:
     display_name: Open Ended Response
+    markdown: ""
 data: |
   <combinedopenended>
   	<rubric>