From ec2008e678adc8f2068fac487600169bc278d370 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Fri, 26 Dec 2014 12:23:02 +0000 Subject: [PATCH] Fixed build script - some random merge text --- build.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.php b/build.php index c2a848b..8953d41 100644 --- a/build.php +++ b/build.php @@ -37,11 +37,7 @@ logstr("Reading `core.php`...", false); $build = file_get_contents("core.php"); logstr("done", true, false); logstr("Reading `settings.fragment.php`...", false); -<<<<<<< HEAD $settings = removeouterphptags(file_get_contents("settings.fragment.php")); -======= -$settings = removeouterphptag(file_get_contents("settings.fragment.php")); ->>>>>>> 582dcc5c5355ee8126911ad537f18c3d1c4933a6 logstr("done", true, false); logstr("Building.....", false);