Moving conditionals and endpoints out of UserInputMapper

Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
This commit is contained in:
Brad Davis 2015-10-23 13:28:36 -07:00
parent 0fdd32709f
commit d5425ac625
2 changed files with 1 additions and 1 deletions

View file

@ -18,3 +18,4 @@ bool AndConditional::satisfied() {
}
return true;
}

View file

@ -28,5 +28,4 @@ private:
}
#endif