From 2f3d819dad5c990229b0ac824a6f1346819adddc Mon Sep 17 00:00:00 2001
From: Bernard Knueven <Bernard.Knueven@nrel.gov>
Date: Mon, 29 Apr 2024 15:42:18 -0600
Subject: [PATCH] cleanup merge

---
 mpisppy/cylinders/lagrangian_bounder.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/mpisppy/cylinders/lagrangian_bounder.py b/mpisppy/cylinders/lagrangian_bounder.py
index 63ed69228..927a47d89 100644
--- a/mpisppy/cylinders/lagrangian_bounder.py
+++ b/mpisppy/cylinders/lagrangian_bounder.py
@@ -87,7 +87,6 @@ def main(self):
                 if extensions:
                     self.opt.extobject.enditer_after_sync()
                 self.dk_iter += 1
-<<<<<<< HEAD
             elif self.opt.options.get("subgradient_while_waiting", False):
                 # compute a subgradient step
                 self.opt.Compute_Xbar(verbose)
@@ -95,12 +94,3 @@ def main(self):
                 bound = self.lagrangian()
                 if bound is not None:
                     self.bound = bound
-
-    def finalize(self):
-        self.final_bound = self.bound
-        if self.opt.extensions is not None and \
-            hasattr(self.opt.extobject, 'post_everything'):
-            self.opt.extobject.post_everything()
-        return self.final_bound
-=======
->>>>>>> upstream/main