From 388cb481d5fd60314ec812ce360ef0ecff59a3ce Mon Sep 17 00:00:00 2001
From: Robert Kruszewski <robertk@palantir.com>
Date: Fri, 15 Sep 2017 16:56:11 +0100
Subject: [PATCH] correctly resolve conflicts

---
 .../main/scala/org/apache/spark/mllib/optimization/LBFGS.scala | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mllib/src/main/scala/org/apache/spark/mllib/optimization/LBFGS.scala b/mllib/src/main/scala/org/apache/spark/mllib/optimization/LBFGS.scala
index 05eeff532f12e..21ec287e497d4 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/optimization/LBFGS.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/optimization/LBFGS.scala
@@ -263,9 +263,6 @@ object LBFGS extends Logging {
       // broadcasted model is not needed anymore
       bcW.destroy(blocking = false)
 
-      // broadcasted model is not needed anymore
-      bcW.destroy()
-
       /**
        * regVal is sum of weight squares if it's L2 updater;
        * for other updater, the same logic is followed.