병합에러수정

DeptPage.js

@@ -3,8 +3,8 @@ import { StyleSheet, Text, View, FlatList, TouchableOpacity, Modal, Alert, Touch
 import TodoItem from './components/todoItem';
 import InfoForm from './screens/InfoForm';
 import Ionicons from 'react-native-vector-icons/Ionicons';
-import Infodetails from './screens/InfoDetails'
-import ButtonsForm from './components/ButtonsForm';
+import InfoDetails from './screens/InfoDetails'
+import ButtonsForm from './components/ButtonsForm'; 
 import { TabView } from 'react-native-elements';
 
 
@@ -36,9 +36,6 @@ function DeptPage({ navigation }) {
     });
   }
 
-
-
-
   return (
     <TouchableWithoutFeedback onPress={() => {
       Keyboard.dismiss();
@@ -95,7 +92,7 @@ function DeptPage({ navigation }) {
             </View>
           </Modal>
         </View>
-      </View>
+      </View> 
     </TouchableWithoutFeedback >
   );
 }

MainScreen.js

-import React from 'react';
+import React, {useState} from 'react';
 import { View, Text, TextInput, StyleSheet, Button, Keyboard, TouchableWithoutFeedback, Modal } from 'react-native';
 import { SpeedDial } from 'react-native-elements';
 import WeeklyCalendar from './components/WeeklyCalendar';
-import InsertCat from './InsertCat';
+import Ionicons from 'react-native-vector-icons/Ionicons';
+import DeptPage from './DeptPage';
 
 function MainScreen({ navigation }) {
     const [number, onChangeNumber] = useState(null);