Fixed build script - some random merge text

2014-12-26 12:23:02 +00:00 · 2014-12-26 12:23:02 +00:00 · ec2008e678
parent 24d2aa7f76
commit ec2008e678
1 changed files with 0 additions and 4 deletions
--- 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);