From 06efad1ac89669240348cedc8a1b7ad71e7b0e7e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 24 Aug 2013 02:37:15 -0400
Subject: [PATCH] Fix last commit conflict
---
program/lib/Roundcube/bootstrap.php | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index 1d82616..65f98e9 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -84,13 +84,6 @@
@mb_regex_encoding(RCUBE_CHARSET);
}
-<<<<<<< HEAD
-// make sure the lib directory is in the include_path
-$rcube_include_path = realpath(RCUBE_LIB_DIR . '..');
-$sep = PATH_SEPARATOR;
-if (!preg_match("!(^|$sep)$rcube_include_path($sep|\$)!", ini_get('include_path'))) {
- set_include_path(ini_get('include_path') . PATH_SEPARATOR . $rcube_include_path);
-=======
// make sure the Roundcube lib directory is in the include_path
$rcube_path = realpath(RCUBE_LIB_DIR . '..');
$sep = PATH_SEPARATOR;
@@ -99,7 +92,6 @@
if (!preg_match($regexp, $path)) {
set_include_path($path . PATH_SEPARATOR . $rcube_path);
->>>>>>> 9f75449... Fix unquoted path in PREG expression on Windows (#1489290)
}
// Register autoloader
--
Gitblit v1.9.1