Resolve conflicts with master

1 files changed, 1 insertions, 3 deletions

diff --git a/source/Irrlicht/COBJMeshFileLoader.h b/source/Irrlicht/COBJMeshFileLoader.h
index c03197a..c706a5d 100644
--- a/source/Irrlicht/COBJMeshFileLoader.h
+++ b/source/Irrlicht/COBJMeshFileLoader.h
@@ -7,7 +7,6 @@
 

 #include <map>

 #include "IMeshLoader.h"

-#include "IFileSystem.h"

 #include "ISceneManager.h"

 #include "irrString.h"

 #include "SMeshBuffer.h"

@@ -23,7 +22,7 @@ class COBJMeshFileLoader : public IMeshLoader
 public:

 

 	//! Constructor

-	COBJMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs);

+	COBJMeshFileLoader(scene::ISceneManager* smgr);

 

 	//! destructor

 	virtual ~COBJMeshFileLoader();

@@ -104,7 +103,6 @@ private:
 	void cleanUp();

 

 	scene::ISceneManager* SceneManager;

-	io::IFileSystem* FileSystem;

 

 	core::array<SObjMtl*> Materials;

 };