Save base.py merge conflict correction

PCMDI · Dec 8, 2016 · 0b41846 · 0b41846
1 parent 75ad09c
commit 0b41846
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/python/io/base.py b/src/python/io/base.py
@@ -7,12 +7,9 @@
 import pcmdi_metrics
 import cdat_info
 import hashlib
-<<<<<<< HEAD
 import subprocess
-=======
 import numpy
 import collections
->>>>>>> PCMDI
 
 value = 0
 cdms2.setNetcdfShuffleFlag(value) # where value is either 0 or 1