Fakultas Ilmu Komputer UI

Commit 7fe4ad03 authored by Doan Andreas Nathanael's avatar Doan Andreas Nathanael
Browse files

Merge branch 'staging' into 'PBI-4-regis_ui'

# Conflicts:
#   src/constants/navigation.ts
#   src/scenes/cart/ProgramDetail/index.tsx
#   src/scenes/index.ts
parents 36fb9814 f7e9cff5
Pipeline #72017 passed with stages
in 15 minutes and 50 seconds
...@@ -6,7 +6,7 @@ import React, { FC } from 'react'; ...@@ -6,7 +6,7 @@ import React, { FC } from 'react';
import { View, Text, StyleSheet } from 'react-native'; import { View, Text, StyleSheet } from 'react-native';
import { Icon, ListItem } from 'react-native-elements'; import { Icon, ListItem } from 'react-native-elements';
import { ScrollView } from 'react-native-gesture-handler'; import { ScrollView } from 'react-native-gesture-handler';
import { DietelaProgram } from 'services/dietelaQuiz/quizResult'; import { DietelaProgram } from 'services/cart/models';
import { colors, layoutStyles } from 'styles'; import { colors, layoutStyles } from 'styles';
interface IdProgram { interface IdProgram {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment