merge conficts fixed

1 files changed, 8 insertions, 0 deletions

diff --git a/mwe/resource-manager/Audio_asset.cpp b/mwe/resource-manager/Audio_asset.cpp
new file mode 100644
index 0000000..20c98b2
--- /dev/null
+++ b/mwe/resource-manager/Audio_asset.cpp
@@ -0,0 +1,8 @@
+
+
+#include "Audio_asset.h"
+#include <string>
+
+Audio::Audio(const std::string & content) { this->m_content = content; }
+
+Audio::~Audio() {}