From f4ed7104205258ccc85aa8e0d03c3c2b8a39a7cb Mon Sep 17 00:00:00 2001
From: "kev :)" <kja@blueyonder.co.uk>
Date: Sun, 11 Nov 2012 00:47:24 +0000
Subject: [PATCH] FIx broken merge

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

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