sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-12-22 13:45:02 +00:00
Code Activity

Fixed strange conflict bug

Browse source
This commit is contained in:
Starbeamrainbowlabs 2014-12-26 11:29:31 +00:00
commit 61a4b5ec85
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.php
View file

@ -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);