Lyla Fischer 3f8246f032 merge conflict

2013-07-16 18:25:01 -04:00

..

blank_common.yaml

Move defaults from yaml templates to field definitions.

2013-07-16 14:24:41 -04:00

circuitschematic.yaml

Change default rerandomize and showanswer

2013-07-16 14:33:58 -04:00

customgrader.yaml

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

drag_and_drop.yaml

merge conflict

2013-07-16 18:25:01 -04:00

forumularesponse.yaml

Change default rerandomize and showanswer

2013-07-16 14:33:58 -04:00

imageresponse.yaml

merge conflict

2013-07-16 18:25:01 -04:00

latex_problem.yaml

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

multiplechoice.yaml

Change default rerandomize and showanswer

2013-07-16 14:33:58 -04:00

numericalresponse.yaml

Change default rerandomize and showanswer

2013-07-16 14:33:58 -04:00

optionresponse.yaml

Change default rerandomize and showanswer

2013-07-16 14:33:58 -04:00

problem_with_hint.yaml

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

string_response.yaml

Change default rerandomize and showanswer

2013-07-16 14:33:58 -04:00