wassname/pandas-ta
1
0
Fork 0
mirror of https://github.com/wassname/pandas-ta.git synced 2026-08-03 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
Lluis
2020-05-21 16:56:13 +02:00
parent ba95db0962
commit 325cd50a09
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pandas_ta/core.py
+1 -8
View File
@@ -1105,13 +1105,7 @@ class AnalysisIndicators(BasePandasObject):
close = self._get_column(close, 'close')
volume = self._get_column(volume, 'volume')
from pandas_ta.volume.vp import vp
<<<<<<< HEAD
return vp(close=close, volume=volume, width=width, percent=percent, **kwargs)
=======
result = vp(close=close, volume=volume, width=width, percent=percent, **kwargs)
self._add_prefix_suffix(result, **kwargs)
self._append(result, **kwargs)
return result
@@ -1122,5 +1116,4 @@ class AnalysisIndicators(BasePandasObject):
result = rsi_event(close=close, above_val=above_val, below_val=below_val, length=length, drift=drift, offset=offset, **kwargs)
self._add_prefix_suffix(result, **kwargs)
self._append(result, **kwargs)
return result
>>>>>>> cbba026... Add RSI event
return result