Update dialog.js

greenbone · Apr 30, 2021 · 93ad539 · 93ad539
1 parent 490028c
commit 93ad539
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/gsa/src/web/pages/notes/dialog.js b/gsa/src/web/pages/notes/dialog.js
@@ -348,13 +348,8 @@ const NoteDialog = ({
               <Radio
                 name="resultId"
                 title={_('Any')}
-<<<<<<< HEAD
-                checked={state.resultId === ''}
-                value=""
-=======
                 checked={state.result_id === RESULT_ANY}
                 value={RESULT_ANY}
->>>>>>> 5ab684b5cc... Fix setting result UUID in notes dialog
                 onChange={onValueChange}
               />
               <Divider>
@@ -367,26 +362,16 @@ const NoteDialog = ({
                         })
                       : _('UUID')
                   }
-<<<<<<< HEAD
-                  checked={state.resultId === '0'}
-                  value="0"
-=======
                   checked={state.result_id === RESULT_UUID}
                   value={RESULT_UUID}
->>>>>>> 5ab684b5cc... Fix setting result UUID in notes dialog
                   onChange={onValueChange}
                 />
                 {!fixed && (
                   <TextField
                     name="resultUuid"
                     size="34"
-<<<<<<< HEAD
-                    disabled={state.resultId !== '0'}
-                    value={state.resultId}
-=======
                     disabled={state.result_id !== RESULT_UUID}
                     value={state.result_uuid}
->>>>>>> 5ab684b5cc... Fix setting result UUID in notes dialog
                     onChange={onValueChange}
                   />
                 )}