From 2aa1e700c88650f257c419e2139b5226229b2049 Mon Sep 17 00:00:00 2001
From: David Fridovich-Keil <dfk@utexas.edu>
Date: Thu, 9 Sep 2021 14:56:31 -0500
Subject: [PATCH] fixing merge issues

---
 include/ilqgames/solver/problem.h | 4 +---
 src/problem.cpp                   | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/ilqgames/solver/problem.h b/include/ilqgames/solver/problem.h
index 77c150a7..29ed9e38 100644
--- a/include/ilqgames/solver/problem.h
+++ b/include/ilqgames/solver/problem.h
@@ -142,9 +142,7 @@ class Problem {
   //    std::unique_ptr<std::vector<Strategy>> strategies_;
 
  protected:
-  // Problem();
-  Problem(Time adversarial_time = 0.0)
-      : initialized_(false), adversarial_time_(adversarial_time) {}
+  Problem() : initialized_(false) {}
 
   // Functions for initialization. By default, operating point and strategies
   // are initialized to zero.
diff --git a/src/problem.cpp b/src/problem.cpp
index 98780a41..d1e76b40 100644
--- a/src/problem.cpp
+++ b/src/problem.cpp
@@ -59,8 +59,6 @@
 
 namespace ilqgames {
 
-Problem::Problem() : initialized_(false) {}
-
 size_t Problem::SyncToExistingProblem(const VectorXf& x0, Time t0,
                                       Time planner_runtime,
                                       OperatingPoint& op) {