diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-12 17:39:32 -0500 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-03-12 17:39:32 -0500 |
| commit | 797e0b9153e2155c045c4083f42dbae5a591cfef (patch) | |
| tree | 39cd6f8a64d2e2ad96331404023bb7256034b79a /src | |
| parent | 40a0e9fde2a4a16baebb99f0285fc630ae6cfac1 (diff) | |
fixed merge issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/routes/main/MainStackNavigator.tsx | 1 | ||||
| -rw-r--r-- | src/routes/main/MainStackScreen.tsx | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx index 252ece3b..f7404f27 100644 --- a/src/routes/main/MainStackNavigator.tsx +++ b/src/routes/main/MainStackNavigator.tsx @@ -8,7 +8,6 @@ import { MomentType, ScreenType, SearchCategoryType, - UniversityBadge, UserType, } from '../../types'; diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx index 0a75dd22..95d45d32 100644 --- a/src/routes/main/MainStackScreen.tsx +++ b/src/routes/main/MainStackScreen.tsx @@ -7,6 +7,7 @@ import {normalize} from 'react-native-elements'; import BackIcon from '../../assets/icons/back-arrow.svg'; import { AnimatedTutorial, + BadgeSelection, CaptionScreen, CategorySelection, CreateCustomCategory, |