From: Greg Beaver <cellog@php.net>
Date: Thu, 11 Sep 2008 03:33:10 +0000 (+0000)
Subject: remove weird relic of development past that somehow made it in here on the last commit
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~436
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2fdf4bbccb6385451045386d80d694a402190b0;p=php

remove weird relic of development past that somehow made it in here on the last commit
---

diff --git a/ext/phar/util.c b/ext/phar/util.c
index 573bd42a2d..0723cd2508 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -1186,10 +1186,6 @@ int phar_free_alias(phar_archive_data *phar, char *alias, int alias_len TSRMLS_D
 }
 /* }}} */
 
-static int phar_retrieve_apc(fname, fname_len, archive)
-{
-}
-
 /**
  * Looks up a phar archive in the filename map, connecting it to the alias
  * (if any) or returns null
@@ -1385,18 +1381,11 @@ realpath_success:
 
 			return SUCCESS;
 		}
-<<<<<<< util.c
-		if (SUCCESS == phar_retrieve_apc(fname, fname_len, archive)) {
-			efree(my_realpath);
-			return SUCCESS;
-		}
-=======
 
 		if (PHAR_G(manifest_cached) && SUCCESS == zend_hash_quick_find(&cached_phars, fname, fname_len, fhash, (void**)&fd_ptr)) {
 			goto realpath_success;
 		}
 
->>>>>>> 1.60
 		efree(my_realpath);
 	}