cleanup merge

Pyomo · Apr 29, 2024 · 2f3d819 · 2f3d819
1 parent f386355
commit 2f3d819
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/mpisppy/cylinders/lagrangian_bounder.py b/mpisppy/cylinders/lagrangian_bounder.py
@@ -87,20 +87,10 @@ 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)
                 self.opt.Update_W(verbose)
                 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