Commit ce5ccfbe authored by Andrew Binder's avatar Andrew Binder

bug fix

parent d07fcf85
......@@ -28,11 +28,7 @@ class Questions {
int getMaxLevel() { return maxLevel; }
private:
<<<<<<< HEAD
const static int maxLevel = 10;
=======
static const int maxLevel = 10;
>>>>>>> 91cdf5bafa97e7c667518bd4367d65e0151e2d8a
};
#endif //QUESTIONS_H
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment