resolving the conflict for git rebase

84c51913 · Sina Honari · 1d2eec53 · 84c51913
--- a/theano/tensor/signal/downsample.py
+++ b/theano/tensor/signal/downsample.py