Fix merge bugs

2012-10-27 19:57:29 -04:00
parent d36d8cba6b
commit cc8f0a1634
1 changed files with 2 additions and 2 deletions
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -584,7 +584,7 @@ class VseprInput(InputTypeBase):
    tags = ['vsepr_input']

    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.width = xml.get('width')
@@ -609,7 +609,7 @@ class VseprInput(InputTypeBase):
               }
        return context

-register_input_class(VseprInput)
+registry.register(VseprInput)

 #--------------------------------------------------------------------------------