merge conficts fixed

1 files changed, 11 insertions, 0 deletions

diff --git a/mwe/resource-manager/Image_asset.h b/mwe/resource-manager/Image_asset.h
new file mode 100644
index 0000000..19579de
--- /dev/null
+++ b/mwe/resource-manager/Image_asset.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "resource.h"
+#include <string>
+
+class Texture : public Resource {
+
+public:
+	Texture(const std::string &);
+	~Texture();
+};