1
0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-16 13:04:00 +02:00

fixed merge conflicts

This commit is contained in:
Marco Dickert
2017-07-18 13:32:38 +02:00
parent ede3ec86b8
commit 1171346cbe
5 changed files with 38 additions and 27 deletions

View File

@@ -40,14 +40,14 @@ foreach( $IFM_SRC_PHPFILES as $file ) {
*/
file_put_contents( $IFM_BUILD_STANDALONE, $main );
file_put_contents( $IFM_BUILD_STANDALONE, $phpincludes, FILE_APPEND );
file_put_contents( $IFM_BUILD_STANDALONE, array(
'',
'/**',
' * start IFM',
' */',
'$ifm = new IFM();',
'$ifm->run();'
), FILE_APPEND );
file_put_contents( $IFM_BUILD_STANDALONE,
'
/**
* start IFM
*/
$ifm = new IFM();
$ifm->run();'
, FILE_APPEND );
/**
* Build library