Fixed conflicts

diff --git a/include/common.h b/include/common.h
index fba7e32a37a49c87e80e9597220a19a1518a694e..985dddf63546230db26c2efe1f57846467ecc6fa 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -9,6 +9,7 @@
 #include <cstdlib>
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>
+#include <SDL2/SDL_mixer.h>
 #include <SDL2/SDL_opengl.h>
 
 typedef struct { float x; float y; }vec2;