fix all conflicts

src/components/forum/forumSubjectUpdate.js

@@ -17,16 +17,6 @@ const ForumSubjectUpdate = ({
   const updateSubjectTitle = React.createRef()
   const updateSubjectAuthor = React.createRef()
 
-<<<<<<< HEAD
-  const updateOldSubject = (event) => {
-    event.preventDefault()
-    if ( updateSubjectTitle.current.value !== '') {
-      let putSubject = {
-        id: subject.id,
-        name: updateSubjectTitle.current.value,
-        user_id: user.id,
-        thread_id: threads.actualThreadID,
-=======
   const [selectAuthorID, setSelectAuthorID] = useState(-1)
   const [selectThreadID, setSelectThreadID] = useState(-1)
 
@@ -48,7 +38,6 @@ const ForumSubjectUpdate = ({
         name: updateSubjectTitle.current.value,
         user_id: selectAuthorID === -1 ? subject.user_id : selectAuthorID,
         thread_id: selectThreadID === -1 ? subject.thread_id : selectThreadID,
->>>>>>> front
         token: user.token
       }
       updateSubject(putSubject)
@@ -75,13 +64,8 @@ const ForumSubjectUpdate = ({
             <div>
               <select
                 name='updateSubjectAuthorText'
-<<<<<<< HEAD
-                value={ user.allUsersList }
-                ref={ updateSubjectAuthor }>
-=======
                 onChange={ e => setSelectAuthorID( e.target.value ) }>
                   <option value={ subject.user_id }>Choice Author ( actual: { subject.author } )</option>
->>>>>>> front
                 { user.allUsersList.map( userObject =>
                     <option value={userObject.id}>{userObject.login}, Privilige: { userObject.privilige >= 2 ? 'Moderator' : 'Normal User' }</option>
                   )
@@ -89,12 +73,8 @@ const ForumSubjectUpdate = ({
               </select>
               <select
                 name='updateSubjectAuthorText'
-<<<<<<< HEAD
-                value={ threads.threadsList }>
-=======
                 onChange={ e => setSelectThreadID( e.target.value ) }>
                   <option value={ threads.actualThreadID }>Choice Thread ( actual: { threads.actualThreadName } )</option>
->>>>>>> front
                 { threads.threadsList.map( threadObject =>
                     <option value={threadObject.id}>{threadObject.name}, moderator: {threadObject.moderator}</option>
                   )