resolved git conflict

2018-09-17 17:41:47 +01:00
parent 3e6e6f40df
commit ed4179dcd1
12 changed files with 67 additions and 268 deletions
--- a/OpenGL/texture.cpp
+++ b/OpenGL/texture.cpp
@@ -1,20 +1,12 @@
-<<<<<<< HEAD
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb_image.h"
 #include "texture.h"
-=======
-#include "texture.h"
-#include "stb_image.h"
->>>>>>> 11f63887e9573415f2ed2fed84986ab4c4bd0b4f
 #include <cassert>
 #include <iostream>

 Texture::Texture(std::string fileName) {
-<<<<<<< HEAD
 	stbi_set_flip_vertically_on_load(true);

-=======
->>>>>>> 11f63887e9573415f2ed2fed84986ab4c4bd0b4f
 	int width, height, numComponents;
 	unsigned char* imageData = stbi_load(fileName.c_str(), &width, &height, &numComponents, 4);