perubahan

view/Account.js

@@ -40,15 +40,10 @@ class Account extends React.Component {
     }
 
     componentDidMount() {
-<<<<<<< HEAD
-        this._getPermissions()
-        this._unsubscribe = this.props.navigation.addListener('focus', () => {
-            this._getPermissions()
-=======
+
         this._getProfile()
         this._unsubscribe = this.props.navigation.addListener('focus', () => {
             this._getProfile()
->>>>>>> 5330b388dc7213ae44adb8e73631468949e34c73
         });
     }
 

view/DeliveryAddrees.js

@@ -4,7 +4,7 @@ import { ScrollView, TouchableOpacity } from 'react-native-gesture-handler';
 import { connect } from 'react-redux';
 import Axios from 'axios';
 import ActionType from '../redux/globalActionType';
-import ravLog from '../helper/debug';
+// import ravLog from '../helper/debug';
 
 class DeliveryAddrees extends React.Component {
     constructor(props) {

view/OrderHistory.js

@@ -28,8 +28,6 @@ class OrderHistory extends React.Component {
     componentWillUnmount() {
         this._unsubscribe();
     }
-
-
     // componentDidMount() {
     //     this.getOrderHistory()
     // }