gistfile1.txt

atherine-Scotts-MacBook-Air:SimpleCV katherinescott$ git pull origin kscottz
From github.com:/ingenuitas/SimpleCV
 * branch            kscottz    -> FETCH_HEAD
CONFLICT (rename/delete): Rename SimpleCV/BOFFeatureExtractor.py->SimpleCV/Analysis/BOFFeatureExtractor.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ColorSegmentation.py->SimpleCV/Segmentation/ColorSegmentation.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/DiffSegmentation.py->SimpleCV/Segmentation/DiffSegmentation.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/EdgeHistogramFeatureExtractor.py->SimpleCV/Analysis/EdgeHistogramFeatureExtractor.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/FeatureExtractorBase.py->SimpleCV/Analysis/FeatureExtractorBase.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/HaarLikeFeature.py->SimpleCV/Analysis/HaarLikeFeature.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/HaarLikeFeatureExtractor.py->SimpleCV/Analysis/HaarLikeFeatureExtractor.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/HueHistogramFeatureExtractor.py->SimpleCV/Analysis/HueHistogramFeatureExtractor.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/MorphologyFeatureExtractor.py->SimpleCV/Analysis/MorphologyFeatureExtractor.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/RunningSegmentation.py->SimpleCV/Segmentation/RunningSegmentation.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/SegmentationBase.py->SimpleCV/Segmentation/SegmentationBase.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/BOFTester.py->SimpleCV/MachineLearning/BOFTester.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/BinarySVMClassifier.py->SimpleCV/MachineLearning/BinarySVMClassifier.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/HaarTest.py->SimpleCV/MachineLearning/HaarTest.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/KNNClassifier.py->SimpleCV/MachineLearning/KNNClassifier.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/MLTestSuite.py->SimpleCV/MachineLearning/MLTestSuite.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/NaiveBayesClassifier.py->SimpleCV/MachineLearning/NaiveBayesClassifier.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/SVMClassifier.py->SimpleCV/MachineLearning/SVMClassifier.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/TreeClassifier.py->SimpleCV/MachineLearning/TreeClassifier.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/cbdata.txt->SimpleCV/MachineLearning/cbdata.txt in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/codebook.png->SimpleCV/MachineLearning/codebook.png in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/haar.txt->SimpleCV/MachineLearning/haar.txt in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/query_imgs/flickrapi2.py->SimpleCV/MachineLearning/query_imgs/flickrapi2.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/query_imgs/get_imgs_geo_gps_search.py->SimpleCV/MachineLearning/query_imgs/get_imgs_geo_gps_search.py in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
CONFLICT (rename/delete): Rename SimpleCV/ml/query_imgs/query.dat->SimpleCV/MachineLearning/query_imgs/query.dat in HEAD and deleted in dabab39a9e954a09520cffbd434efac5bb1192fe
Automatic merge failed; fix conflicts and then commit the result.