fixed merge conflicts

calblueprint · Dec 2, 2024 · 7169d0d · 7169d0d
1 parent 711fe8e
commit 7169d0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/screens/Contact/Contact.tsx b/src/screens/Contact/Contact.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+/* import React from 'react';
 import {
   Linking,
   ScrollView,
@@ -15,7 +15,7 @@ import OcfLogo from '../svg/ocf-logo.svg';
 import Website from '../svg/website.svg';
 import { styles } from './styles';
 
-/* type ContactProps = NativeStackScreenProps<RootStackParamList, 'Contact'>;
+type ContactProps = NativeStackScreenProps<RootStackParamList, 'Contact'>;
 
 export default function Contact({ navigation }: ContactProps) {
   const openLink = (url: string) => {
@@ -68,4 +68,5 @@ export default function Contact({ navigation }: ContactProps) {
     </ScrollView>
   );
 };
+
  */
diff --git a/src/screens/Contact/Directory.tsx b/src/screens/Contact/Directory.tsx
@@ -1,9 +0,0 @@
-import React from 'react';
-import {
-  Linking,
-  ScrollView,
-  Text,
-  TouchableOpacity,
-  View,
-} from 'react-native';
-import { styles } from './styles';