충돌 제거

src/containers/analysis/history/AnalysisHistoryContainer.js

@@ -240,32 +240,6 @@ export const AnalysisHistoryContainer = props => {
     search1: '',
     groupId: searchData.groupId
   });
-<<<<<<< HEAD
-=======
-
-  useEffect(() => {
-    setParams({
-      ...params,
-      stDate: '',
-      endDate: '',
-      search1: '',
-      groupId: searchData.groupId
-    });
-  }, [searchData.groupId]);
-
-
-  useEffect(() => {
-    if (data) return;
-  }, [searchParams]);
-
-  const onKeyPress = e => {
-    if (e.key == 'Enter') {
-      handlerSearch();
-    }
-  };
->>>>>>> 7b04365e79a46f1e9cf6d47485e22c3241da7b01
-
-  // useEffect(() => { }, [params]);
 
   const handlerSearch = () => {
     if (!params.stDate || !params.endDate) {