From d5425ac625b27bafdb01e6a9853756e80cd95856 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 23 Oct 2015 13:28:36 -0700 Subject: [PATCH] Moving conditionals and endpoints out of UserInputMapper Conflicts: libraries/controllers/src/controllers/UserInputMapper.cpp --- .../src/controllers/impl/conditionals/AndConditional.cpp | 1 + .../src/controllers/impl/conditionals/AndConditional.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/controllers/src/controllers/impl/conditionals/AndConditional.cpp b/libraries/controllers/src/controllers/impl/conditionals/AndConditional.cpp index 1633f9a439..772d4f1314 100644 --- a/libraries/controllers/src/controllers/impl/conditionals/AndConditional.cpp +++ b/libraries/controllers/src/controllers/impl/conditionals/AndConditional.cpp @@ -18,3 +18,4 @@ bool AndConditional::satisfied() { } return true; } + diff --git a/libraries/controllers/src/controllers/impl/conditionals/AndConditional.h b/libraries/controllers/src/controllers/impl/conditionals/AndConditional.h index 5fc8b7df2a..c60e4b15df 100644 --- a/libraries/controllers/src/controllers/impl/conditionals/AndConditional.h +++ b/libraries/controllers/src/controllers/impl/conditionals/AndConditional.h @@ -28,5 +28,4 @@ private: } - #endif