modified: EI_mxnet_module_API_Resnet50.py

awslabs · Jul 31, 2019 · a34c1b8 · a34c1b8
1 parent 492bad2
commit a34c1b8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/ec2-spot-elastic-inference/EI_mxnet_module_API_Resnet50.py b/ec2-spot-elastic-inference/EI_mxnet_module_API_Resnet50.py
@@ -46,11 +46,7 @@
 
 
 img = mx.image.imread(image)
-<<<<<<< HEAD
 
-=======
-                                                                                                                                                      1,1           Top
->>>>>>> a9b1aae82201851ad741900b32ddf8ec2436676d
 # convert into format (batch, RGB, width, height)
 
 img = mx.image.imresize(img, 224, 224) # resize