8000 fixing conflict · Marcdertiger/plotly.py@65cdf6e · GitHub
[go: up one dir, main page]

Skip to content

Commit 65cdf6e

Browse files
committed
fixing conflict
2 parents 323b9ad + 2936451 commit 65cdf6e

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

plotly/check_version.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,23 @@
55
def get_latest():
66
data = urllib2.urlopen('https://raw.githubusercontent.com/plotly/plotly.py/master/plotly/version.py') # it's a file like object and works just like a file
77
version_string = [i for i in data][0]
8+
<<<<<<< HEAD
89
latest_version = re.findall(r'\'.*\'', version_string)[0][1:-1]
10+
=======
11+
latest_version = re.findall(r'\'.*', version_string)[0][1:-1]
12+
>>>>>>> 293645169191f9e9451f689197c7526ab214268f
913
return latest_version
1014

1115
def run_duration(f, **kwargs):
1216
import timeit
1317
start_time = timeit.default_timer()
1418
f(**kwargs)
1519
return (timeit.default_timer() - start_time)
20+
<<<<<<< HEAD
1621

22+
=======
23+
24+
>>>>>>> 293645169191f9e9451f689197c7526ab214268f
1725

1826

1927

0 commit comments

Comments
 (0)
0