调整

public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js

@@ -168,11 +168,16 @@ const AddTestDemo = (props) => {
           </FormItem>
           <FormItem
             label={<span className={'label_text'}>输出</span>}
+<<<<<<< HEAD
 <<<<<<< HEAD
             validateStatus={testCaseValidate.output.validateStatus}
             help={testCaseValidate.output.errMsg}
             colon={false}
 =======
+=======
+            validateStatus={testCaseValidate.output.validateStatus}
+            help={testCaseValidate.output.errMsg}
+>>>>>>> 91fc391... 调整
             colon={ false }
 >>>>>>> 8f5b1de... 题库地址
           >