From f440ac92ff0b62091e50c48f36498c89208736ba Mon Sep 17 00:00:00 2001
From: dellaert <dellaert@cc.gatech.edu>
Date: Sun, 10 Apr 2016 18:30:24 -0700
Subject: [PATCH] Removed conflict stuff: Jing, why reinterpret_cast ?

---
 gtsam/nonlinear/Values-inl.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gtsam/nonlinear/Values-inl.h b/gtsam/nonlinear/Values-inl.h
index 590767e90..cd8473a09 100644
--- a/gtsam/nonlinear/Values-inl.h
+++ b/gtsam/nonlinear/Values-inl.h
@@ -292,12 +292,8 @@ namespace gtsam {
        Eigen::Matrix<double, -1, 1> operator()(Key j,
           const gtsam::Value * const pointer) {
         try {
-//<<<<<<< HEAD
           // value returns a const Vector&, and the return makes a copy !!!!!
           return dynamic_cast<const GenericValue<Eigen::Matrix<double, -1, 1> >&>(*pointer).value();
-//=======
-//          return reinterpret_cast<const GenericValue<Eigen::Matrix<double, -1, 1> >&>(*pointer).value();
-//>>>>>>> feature/FixFixedValues
         } catch (std::bad_cast &) {
           // If a fixed vector was stored, we end up here as well.
           throw ValuesIncorrectType(j, typeid(*pointer),