This commit is contained in:
Jacob Lauritzen 2017-11-22 10:19:08 +01:00
parent 5b2a949f6f
commit 6e76cfd81e

View File

@ -1,11 +1,6 @@
import React from 'react';
<<<<<<< HEAD:expoexample/progresschart/ProgressChart.js
import { AppRegistry, Button, StyleSheet, Text, View, PanResponder } from 'react-native';
import { AnimatedCircularProgress } from 'react-native-circular-progress';
=======
import { StyleSheet, Text, View, PanResponder } from 'react-native';
import { CircularProgress, AnimatedCircularProgress } from 'react-native-circular-progress';
>>>>>>> Update expo example:example/App.js
const MAX_POINTS = 500;