Skip to content

E
edx-platform
Commit cc8f0a16 by Victor Shnayder
Options

Fix merge bugs

parent d36d8cba
Showing with 2 additions and 2 deletions
common/lib/capa/capa/inputtypes.py
...@@ -584,7 +584,7 @@ class VseprInput(InputTypeBase): ...@@ -584,7 +584,7 @@ class VseprInput(InputTypeBase):
tags = ['vsepr_input'] tags = ['vsepr_input']
def __init__(self, system, xml, state): def __init__(self, system, xml, state):
super(ImageInput, self).__init__(system, xml, state) super(VseprInput, self).__init__(system, xml, state)
self.height = xml.get('height') self.height = xml.get('height')
self.width = xml.get('width') self.width = xml.get('width')
...@@ -609,7 +609,7 @@ class VseprInput(InputTypeBase): ...@@ -609,7 +609,7 @@ class VseprInput(InputTypeBase):
} }
return context return context
register_input_class(VseprInput) registry.register(VseprInput)
#-------------------------------------------------------------------------------- #--------------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment