From 6a1a1758ee2cee45548131f6fa4bcf29d16b2ddd Mon Sep 17 00:00:00 2001 From: ClimbsRocks Date: Mon, 11 Sep 2017 19:27:43 -0700 Subject: [PATCH] fixes sneaky git conflict message --- tests/classifiers.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/classifiers.py b/tests/classifiers.py index 3ef5ee6..2fa0518 100644 --- a/tests/classifiers.py +++ b/tests/classifiers.py @@ -273,8 +273,6 @@ def getting_single_predictions_multilabel_classification(model_name=None): assert lower_bound < second_score < 0.79 -<<<<<<< HEAD -======= def feature_learning_getting_single_predictions_classification(model_name=None): np.random.seed(0) @@ -457,5 +455,3 @@ def feature_learning_categorical_ensembling_getting_single_predictions_classific # Make sure our score is good, but not unreasonably good assert lower_bound < second_score < -0.147 - ->>>>>>> 96df083f8056914a4dd549bfd44721e3931493e3