resolve one more conflict

theano/sandbox/gpuarray/dnn.py

@@ -1077,11 +1077,6 @@ class GpuDnnPool(DnnBase):
         if mode == 'average':
             mode = 'average_inc_pad'
         assert mode in ('max', 'average_inc_pad', 'average_exc_pad')
-<< << << < HEAD
-== == == =
-        if version() == -1:
-            raise Exception("cudnn v1 do not support average_exc_pad")
->>>>>> > cb3fbfe94620d4938c10ac2e20d43f8a286e3856
         self.mode = mode
 
     def get_op_params(self):