zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-01 09:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing compil

Browse Source
This commit is contained in:
Clément Le Bihan
2021-05-23 16:49:01 +02:00
parent 1d4f48a3f1
commit d1c3dc6e25
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/main.cpp
-11
View File
@@ -7,19 +7,8 @@
#include <iostream>
<<<<<<< Updated upstream
#include <Wal.hpp>
=======
#include <cmath>
#include "Window.hpp"
#include "Drawables/2D/Text.hpp"
#include "Drawables/2D/Circle.hpp"
#include "Controllers/Keyboard.hpp"
#include "Camera/Camera3D.hpp"
#include "Drawables/3D/Grid.hpp"
#include "Drawables/3D/Cube.hpp"
#include "Wal.hpp"
>>>>>>> Stashed changes
int main()
{