From c24ea023f6ca6e537ed11e33f9afdd21996b762e Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 13 Mar 2015 18:26:09 -0700
Subject: [PATCH] still recovering from troubled merge

---
 libraries/physics/src/ShapeManager.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/physics/src/ShapeManager.h b/libraries/physics/src/ShapeManager.h
index 3cb8da4c60..b966278e48 100644
--- a/libraries/physics/src/ShapeManager.h
+++ b/libraries/physics/src/ShapeManager.h
@@ -19,7 +19,6 @@
 
 #include "DoubleHashKey.h"
 
-
 class ShapeManager {
 public: