C4D. Fix merge conflicts

code/AssetLib/C4D/C4DImporter.cpp

@@ -117,13 +117,15 @@ C4DImporter::~C4DImporter() {
 }
 
 // ------------------------------------------------------------------------------------------------
-bool C4DImporter::CanRead( const std::string& /*pFile*/, IOSystem* /*pIOHandler*/, bool /*checkSig*/) const {
-const std::string& extension = GetExtension(pFile);
+bool C4DImporter::CanRead( const std::string& pFile, IOSystem* /*pIOHandler*/, bool /*checkSig*/) const {
+    const std::string& extension = GetExtension(pFile);
     if (extension == "c4d") {
         return true;
     } else if ((!extension.length() || checkSig) && pIOHandler)   {
         // TODO
     }
+    
+    return false;
 }
 
 // ------------------------------------------------------------------------------------------------