From cf5cb4ced43bac8d8e578beef3eccc00d5e94504 Mon Sep 17 00:00:00 2001
From: Ryan Curtin <ryan@ratml.org>
Date: Thu, 3 Sep 2020 23:00:57 -0400
Subject: [PATCH] Update HISTORY.md

Co-authored-by: James J Balamuta <coatless@users.noreply.github.com>
---
 HISTORY.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 0583eec9ac..7943e77272 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -137,7 +137,6 @@
   * The DecisionStump class has been marked deprecated; use the `DecisionTree`
     class with `NoRecursion=true` or use `ID3DecisionStump` instead (#2099).
 
->>>>>>> origin/master
   * Added `probabilities_file` parameter to get the probabilities matrix of
     AdaBoost classifier (#2050).