still recovering from troubled merge

This commit is contained in:
Seth Alves 2015-03-13 18:26:09 -07:00
parent af2c00b235
commit c24ea023f6

View file

@ -19,7 +19,6 @@
#include "DoubleHashKey.h" #include "DoubleHashKey.h"
class ShapeManager { class ShapeManager {
public: public: