From 6e76cfd81e6bba9216e1fbcf4038385c8531b8b7 Mon Sep 17 00:00:00 2001 From: Jacob Lauritzen Date: Wed, 22 Nov 2017 10:19:08 +0100 Subject: [PATCH] Rebase --- example/App.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/example/App.js b/example/App.js index 85ad86c..79ec2a8 100644 --- a/example/App.js +++ b/example/App.js @@ -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;