mirror of
https://github.com/bartgryszko/react-native-circular-progress.git
synced 2026-01-25 16:25:58 +00:00
Rebase
This commit is contained in:
parent
5b2a949f6f
commit
6e76cfd81e
@ -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;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user