bump version

cldougl · cldougl · commit 5e5df9e25fe7 · 2015-07-29T00:40:58.000-04:00
- update version number
- add end line to tools.py
diff --git a/plotly/tools.py b/plotly/tools.py
@@ -2861,3 +2861,4 @@ def get_candle_decrease(self):
 
         return (decrease_x, decrease_close, decrease_dif,
                 stick_decrease_y, stick_decrease_x)
+
diff --git a/plotly/version.py b/plotly/version.py
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-__version__ = '1.8.0'
-=======
-__version__ = '1.7.8'
->>>>>>> master
+__version__ = '1.7.9'
+

Original file line number	Diff line number	Diff line change
`@@ -2861,3 +2861,4 @@ def get_candle_decrease(self):`
`2861`	`2861`
`2862`	`2862`	`return (decrease_x, decrease_close, decrease_dif,`
`2863`	`2863`	`stick_decrease_y, stick_decrease_x)`
	`2864`	`+`