server.php~

<?php
<<<<<<< HEAD
/**
 * Laravel - A PHP Framework For Web Artisans
 *
 * @package  Laravel
 * @author   Taylor Otwell <taylorotwell@gmail.com>
 */

$uri = urldecode(
	parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
);
=======

$uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);

$uri = urldecode($uri);

$paths = require __DIR__.'/bootstrap/paths.php';

$requested = $paths['public'].$uri;
>>>>>>> 3776bec73aabdb8a3b9612e3c8eec6c70215faa0

// This file allows us to emulate Apache's "mod_rewrite" functionality from the
// built-in PHP web server. This provides a convenient way to test a Laravel
// application without having installed a "real" web server software here.
<<<<<<< HEAD
if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri))
=======
if ($uri !== '/' and file_exists($requested))
>>>>>>> 3776bec73aabdb8a3b9612e3c8eec6c70215faa0
{
	return false;
}

<<<<<<< HEAD
require_once __DIR__.'/public/index.php';
=======
require_once $paths['public'].'/index.php';
>>>>>>> 3776bec73aabdb8a3b9612e3c8eec6c70215faa0