From 476f858388ebdf594840bfb7339ce2b50a226c92 Mon Sep 17 00:00:00 2001
From: "kev :)" <kja@blueyonder.co.uk>
Date: Sun, 11 Nov 2012 00:41:27 +0000
Subject: [PATCH] Revert "FIx breakage"

This reverts commit ba63a4ea2a0001e37b7d7a7b426ad44e4db3c0b7.
---
 Core/FileSystems/ISOFileSystem.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/FileSystems/ISOFileSystem.cpp b/Core/FileSystems/ISOFileSystem.cpp
index 59b756161c..b5719c20b6 100644
--- a/Core/FileSystems/ISOFileSystem.cpp
+++ b/Core/FileSystems/ISOFileSystem.cpp
@@ -512,8 +512,11 @@ 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;