FIx breakage

Core/FileSystems/ISOFileSystem.cpp

@@ -512,11 +512,8 @@ std::vector<PSPFileInfo> ISOFileSystem::GetDirListing(std::string path)
 	{
 		TreeEntry *e = entry->children[i];
 
-<<<<<<< HEAD
+
 		if(e->name == "." || e->name == "..") // do not include the relative entries in the list
-=======
-		if(!strcmp(e->name.c_str(), ".") || !strcmp(e->name.c_str(), "..")) // do not include the relative entries in the list
->>>>>>> upstream/master
 			continue;
 
 		PSPFileInfo x;