diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-05 16:38:32 -0500 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-03-05 16:38:32 -0500 |
| commit | 1465df9621fb963ff873485ad927ff79ea547fa0 (patch) | |
| tree | affcb43f37f263f3e0e555dd019dd952b62e1f0a /src/components/taggs | |
| parent | 2360e774d94e271d1d9db0d5b92b801b9325535e (diff) | |
| parent | b1dee65ee7bb8e120fc38a495f4027905d300650 (diff) | |
Merge branch 'master' into tma-634-badge-selection-screen
# Conflicts:
# src/components/taggs/SocialMediaInfo.tsx
Diffstat (limited to 'src/components/taggs')
| -rw-r--r-- | src/components/taggs/SocialMediaInfo.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/taggs/SocialMediaInfo.tsx b/src/components/taggs/SocialMediaInfo.tsx index f05ad503..5497226c 100644 --- a/src/components/taggs/SocialMediaInfo.tsx +++ b/src/components/taggs/SocialMediaInfo.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {StyleSheet, Text, View} from 'react-native'; import {ScreenType} from '../../types'; -import {SocialIcon} from '..'; +import {SocialIcon} from '../common'; import {handleOpenSocialUrlOnBrowser} from '../../utils'; interface SocialMediaInfoProps { |