merge complete really

@@ -5,7 +5,7 @@
     "privacy": "public",
     "sdkVersion": "35.0.0",
     "androidStatusBar": {
-      "backgroundColor": "#2C658E"
+      "backgroundColor": "#20272F"
     },
     "platforms": [
       "ios",

@@ -46,13 +46,8 @@ export default PromptSearch = () => {
         showsButtons={true} 
         loop={false} height={400}
         activeDotColor={LIGHT_MAIN}
-<<<<<<< HEAD
-        nextButton={<Text style={{color:DARK_MAIN, fontSize:60}}>›</Text>}
-        prevButton={<Text style={{color:DARK_MAIN, fontSize:60}}>‹</Text>}
-=======
         nextButton={<Text style={{color:'#002857', fontSize:60}}>›</Text>}
         prevButton={<Text style={{color:'#002857', fontSize:60}}>‹</Text>}
->>>>>>> master
         >
             <FirstSlide />
             <SecondSlide />

@@ -84,11 +84,7 @@ const styles = StyleSheet.create({
         fontSize: 13,
     },
     colorB:{
-<<<<<<< HEAD
         backgroundColor:'#2cc3c2', 
-=======
-        backgroundColor:'#14a986',
->>>>>>> master
         height: 7,
         width: 7,
         marginRight: 5,
@@ -115,11 +111,7 @@ const styles = StyleSheet.create({
         justifyContent: 'center',
         elevation: 2,
         marginTop: 10,
-<<<<<<< HEAD
-        borderRadius: 5,
-=======
         borderRadius: 5
->>>>>>> master
     },
     Text:{
         fontSize: 22,

@@ -23,19 +23,11 @@ const RateLine = ({load,pastRecords }) => {
                 {pastRecords.map((past,index)=> (
                     <View  key={index} style={styles.past}>
                         <Text style={styles.score}>{past.score}</Text>
-<<<<<<< HEAD
-                        <Text style={styles.date}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
-                    </View>
-                ))} 
-                </View>
-                <Text style={styles.message}>당신의 점수 변화를 확인하세요!</Text>
-=======
                         <Text style={styles.day}>{past.date.substring(5,7)+'/'+past.date.substring(8,10)}</Text>
                     </View>
                 ))} 
                 </View>
                 <Text style={styles.message}>당신의 점수 변화를 확인해 보세요!</Text>
->>>>>>> master
             </>
              : <PromptSearchRate />
             }
@@ -55,18 +47,6 @@ const styles = StyleSheet.create({
         elevation: 2,
         marginTop: 10,
         marginBottom: 10,
-<<<<<<< HEAD
-        borderRadius: 5,
-    },
-    info:{
-        fontSize:22,
-        marginBottom: 5,
-        fontFamily:"Bold",
-    },
-    score:{
-        fontSize:20,
-        fontFamily:"Bold",
-=======
         borderRadius: 5
     },
     info:{
@@ -77,38 +57,24 @@ const styles = StyleSheet.create({
     score:{
         fontSize:20,
         color:"#002857"
->>>>>>> master
     },
     scoreContainer:{
         flexDirection:'row',
         justifyContent: 'space-around',
         width:'100%'
     },
-<<<<<<< HEAD
-    data:{ 
-        fontSize:10,
-        textAlign:'center',
-        fontFamily:"Regular",
-=======
     day:{
         fontSize: 10,
         textAlign:'center',
         marginBottom:5
->>>>>>> master
     },
     past:{
         alignItems:'center',
         marginBottom:5
     },
     message:{
-<<<<<<< HEAD
-        fontFamily:"Son",
-        marginTop : 10,
-        fontSize: 20,
-=======
         margin: 5,
         color:"#6e8fb4"
->>>>>>> master
     }
 });
 

@@ -41,11 +41,7 @@ const RateMessage = ({keywordText, score }) => {
         justifyContent: 'center',
         elevation: 2,
         marginTop: 10,
-<<<<<<< HEAD
-        borderRadius: 5,
-=======
         borderRadius: 5
->>>>>>> master
     },
     Text:{
         fontSize: 25,

@@ -49,11 +49,7 @@ const RateSentence = ({originalText, fixedText, keywordText }) => {
         justifyContent: 'center',
         elevation: 2,
         marginTop: 10,
-<<<<<<< HEAD
-        borderRadius: 5,
-=======
         borderRadius: 5
->>>>>>> master
     },
     Text:{
         fontSize: 25,