merge conficts fixed

1 files changed, 10 insertions, 0 deletions

diff --git a/mwe/resource-manager/Image_asset.cpp b/mwe/resource-manager/Image_asset.cpp
new file mode 100644
index 0000000..2ab9116
--- /dev/null
+++ b/mwe/resource-manager/Image_asset.cpp
@@ -0,0 +1,10 @@
+
+
+#include "Image_asset.h"
+#include <SDL_image.h>
+#include <SDL_surface.h>
+#include <string>
+
+Texture::Texture(const std::string & content) { this->m_content = content; }
+
+Texture::~Texture() {}