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 573bd42a2d093b09748e81454fd9efa28d4e8fc8..0723cd2508fb9046c55c7aad12e60716ba14cd51 100644 (file)
--- 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);
        }