clean thunk code emotion

Author: root

src/Reducer/RootReducer.js

@@ -2,13 +2,6 @@ const initialState = {
     questions: []
 };
 
-<<<<<<< HEAD
-=======
-/*type: 'EDIT_QUESTIONS',
-        payload_id: id,
-        payload: data*/
-
->>>>>>> 1cafc2cb72a8877cd935a88d31d567664bdc9a8c
 const RootReducer = (state = initialState, action) => {
     switch (action.type) {
         case 'ADD_QUESTIONS':

src/actionCreators/EditQuestion.js

@@ -4,17 +4,4 @@ export const editQuestions = (id, data) => {
         payload_id: id,
         payload: data
     }
-<<<<<<< HEAD
 }
-=======
-}
-
-
-/*case 'EDIT_QUESTIONS':
-let newStateQuestion = action.payload;
-state.questions[action.id - 1].content = newStateQuestion;
-return {
-    ...state,
-    questions: state.questions
-}*/
->>>>>>> 1cafc2cb72a8877cd935a88d31d567664bdc9a8c

src/components/EditQuestion.js

@@ -1,20 +1,13 @@
 import React, { useState } from 'react';
 import { useDispatch } from 'react-redux';
-<<<<<<< HEAD
-=======
-// import { addQuestions } from '../actionCreators/AddQuestion';
->>>>>>> 1cafc2cb72a8877cd935a88d31d567664bdc9a8c
+
 import { editQuestions } from '../actionCreators/EditQuestion';
 import { formWrapper, inputWrapper } from '../css/GlobalCss';
 
 const EditQuestion = (props) => {
     const [enteredValue, setOutputValue] = useState('');
     const dispatch = useDispatch();
     const { button_id, button_content } = props.location;
-<<<<<<< HEAD
-=======
-    // const questionList = useSelector(state => state.questions);
->>>>>>> 1cafc2cb72a8877cd935a88d31d567664bdc9a8c
     const handleEdit = (enteredText) => {
         setOutputValue(enteredText.target.value);
     }

src/components/QuestionBox.js

@@ -1,10 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import AddThunkQuestion from '../actionCreators/AddThunkQuestion';
 import { useSelector, useDispatch } from 'react-redux';
-<<<<<<< HEAD
-=======
-// import { css } from 'emotion';
->>>>>>> 1cafc2cb72a8877cd935a88d31d567664bdc9a8c
 import { questionWrapper, containerWrapper, buttonWrapper } from '../css/GlobalCss';
 
 const QuestionBox = () => {