Fixed strange conflict bug

2014-12-26 11:29:31 +00:00 · 2014-12-26 11:29:31 +00:00 · 61a4b5ec85
parent 646591fa90 582dcc5c53
commit 61a4b5ec85
1 changed files with 4 additions and 0 deletions
--- a/build.php
+++ b/build.php
@ -37,7 +37,11 @@ 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);