From 7c7e43c98c137738a659181bce716b5cd164dd4a Mon Sep 17 00:00:00 2001
From: vbrancat <virginia.brancato@gmail.com>
Date: Mon, 10 Feb 2020 17:53:38 -0800
Subject: [PATCH] bug fixes

---
 components/isceobj/StripmapProc/runDispersive.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/components/isceobj/StripmapProc/runDispersive.py b/components/isceobj/StripmapProc/runDispersive.py
index 9e94148..9232d4f 100644
--- a/components/isceobj/StripmapProc/runDispersive.py
+++ b/components/isceobj/StripmapProc/runDispersive.py
@@ -8,13 +8,10 @@ import isceobj
 from isceobj.Constants import SPEED_OF_LIGHT
 import numpy as np
 import gdal
-<<<<<<< HEAD
 from scipy.ndimage import median_filter
 from astropy.convolution import convolve
-from scipy import ndimage
 import numpy as np
-=======
->>>>>>> upstream/master
+
 
 try:
     import cv2