From 3ddd7d3e7afa119d0a45169a469df61208ee358f Mon Sep 17 00:00:00 2001
From: dellaert <dellaert@cc.gatech.edu>
Date: Sun, 28 Dec 2014 18:23:11 +0100
Subject: [PATCH] Fix merge error

---
 gtsam/geometry/PinholeCamera.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gtsam/geometry/PinholeCamera.h b/gtsam/geometry/PinholeCamera.h
index e2d0e6aec..b409c956d 100644
--- a/gtsam/geometry/PinholeCamera.h
+++ b/gtsam/geometry/PinholeCamera.h
@@ -496,7 +496,6 @@ private:
 };
 
 
-template<typename Calibration>
 template<typename Calibration>
 struct traits< PinholeCamera<Calibration> > : public internal::Manifold<PinholeCamera<Calibration> > {};