Fixed merge conflict

richelbilderbeek · May 25, 2017 · 7d766c9 · 7d766c9
2 parents b2a107f + eccf6bc
commit 7d766c9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/player.h b/player.h
@@ -4,6 +4,11 @@
 #include "amino_acid.h"
 #include "bullet.h"
 #include "power.h"
+#include <cmath>
+
+#include <SFML/Graphics.hpp>
+
+#include "bullet.h"
 
 class player
 {