E
======================================================================
ERROR: Failure: SyntaxError (invalid syntax (hist_dist_knn.py, line 212))
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/ec2-user/Projects/CIP-build/CIPPython-install/lib/python2.7/site-packages/nose/loader.py", line 418, in loadTestsFromName
addr.filename, addr.module)
File "/home/ec2-user/Projects/CIP-build/CIPPython-install/lib/python2.7/site-packages/nose/importer.py", line 47, in importFromPath
return self.importFromDir(dir_path, fqname)
File "/home/ec2-user/Projects/CIP-build/CIPPython-install/lib/python2.7/site-packages/nose/importer.py", line 94, in importFromDir
mod = load_module(part_fqname, fh, filename, desc)
File "/home/ec2-user/Projects/CIP-build/CIP-build/cip_python/classification/tests/test_classify_image_subtypes.py", line 9, in <module>
from cip_python.classification.classify_image_subtypes \
File "/home/ec2-user/Projects/CIP-build/CIP-build/cip_python/classification/classify_image_subtypes.py", line 26, in <module>
from cip_python.classification.hist_dist_knn import HistDistKNN
File "/home/ec2-user/Projects/CIP-build/CIP-build/cip_python/classification/hist_dist_knn.py", line 212
<<<<<<< HEAD
^
SyntaxError: invalid syntax
----------------------------------------------------------------------
Ran 1 test in 0.001s
FAILED (errors=1)