From ba63a4ea2a0001e37b7d7a7b426ad44e4db3c0b7 Mon Sep 17 00:00:00 2001
From: "kev :)" <kja@blueyonder.co.uk>
Date: Sat, 10 Nov 2012 23:14:07 +0000
Subject: [PATCH] FIx breakage

---
 Core/FileSystems/ISOFileSystem.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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