Fix after rebase

This commit is contained in:
mashazyu
2020-04-28 19:50:22 +02:00
committed by Sofiya Tepikin
parent c367a1e233
commit 0c3bfdfced
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -3,12 +3,12 @@ import PropTypes from 'prop-types'
import { View, FlatList, ActivityIndicator } from 'react-native' import { View, FlatList, ActivityIndicator } from 'react-native'
import NoData from './no-data' import NoData from './no-data'
import AppLoadingView from '../app-loading' import AppLoadingView from '../common/app-loading'
import YAxis from './y-axis' import YAxis from './y-axis'
import nfpLines from './nfp-lines' import nfpLines from './nfp-lines'
import DayColumn from './day-column' import DayColumn from './day-column'
import HorizontalGrid from './horizontal-grid' import HorizontalGrid from './horizontal-grid'
import AppText from '../app-text' import AppText from '../common/app-text'
import { connect } from 'react-redux' import { connect } from 'react-redux'
import { navigate } from '../../slices/navigation' import { navigate } from '../../slices/navigation'
+1 -1
View File
@@ -2,7 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { View } from 'react-native' import { View } from 'react-native'
import AppText from '../app-text' import AppText from '../common/app-text'
import SettingsButton from '../settings/shared/settings-button' import SettingsButton from '../settings/shared/settings-button'
import { shared } from '../../i18n/en/labels' import { shared } from '../../i18n/en/labels'