Resolved conflicts

Former-commit-id: 4bd4e4f8435d701d16d3864dd030a6c1cff48c47

include/Nazara/Renderer/Texture.hpp

@@ -43,6 +43,8 @@ class NAZARA_API NzTexture : public NzResource, NzNonCopyable
 		unsigned int GetWidth() const;
 		nzTextureWrap GetWrapMode() const;
 
+		bool HasMipmaps() const;
+
 		bool IsCompressed() const;
 		bool IsCubemap() const;
 		bool IsTarget() const;