From fcc9108beb5b362cf6a50b52140f7f34863980d2 Mon Sep 17 00:00:00 2001
From: Marco Dickert <marco@misterunknown.de>
Date: Tue, 18 Jul 2017 13:34:29 +0200
Subject: [PATCH] fixed merge conflicts

---
 .gitattributes |  5 +++--
 compiler.php   | 17 +++++++++++------
 ifm.php        | 10 +++++-----
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index ebf4564..7635ed6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
-ifm.php -diff
-build/* -diff
+ifm.php		-diff
+ifm.min.php	-diff
+build/*		-diff
diff --git a/compiler.php b/compiler.php
index bace82e..90e99c2 100755
--- a/compiler.php
+++ b/compiler.php
@@ -13,6 +13,7 @@ $IFM_SRC_PHPFILES = array( "src/ifmzip.php" );
 $IFM_SRC_JS = "src/ifm.js";
 
 $IFM_BUILD_STANDALONE = "ifm.php";
+$IFM_BUILD_STANDALONE_COMPRESSED = "ifm.min.php";
 $IFM_BUILD_LIB_PHP = "build/ifmlib.php";
 
 /**
@@ -40,14 +41,18 @@ 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,
-'
+file_put_contents( $IFM_BUILD_STANDALONE, '
+	/**
+	 * start IFM
+	 */
+	$ifm = new IFM();
+	$ifm->run();
+', FILE_APPEND );
+
 /**
- * start IFM
+ * Build compressed standalone script
  */
-$ifm = new IFM();
-$ifm->run();'
-, FILE_APPEND );
+file_put_contents( $IFM_BUILD_STANDALONE_COMPRESSED, '<?php eval( gzdecode( file_get_contents( __FILE__, false, null, 85 ) ) ); exit(0); ?>' . gzencode( file_get_contents( "ifm.php", false, null, 5 ) ) );
 
 /**
  * Build library
diff --git a/ifm.php b/ifm.php
index 128952f..7ce533d 100644
--- a/ifm.php
+++ b/ifm.php
@@ -2837,8 +2837,8 @@ class IFMZip {
 	}
 }
 
-/**
- * start IFM
- */
-$ifm = new IFM();
-$ifm->run();
\ No newline at end of file
+	/**
+	 * start IFM
+	 */
+	$ifm = new IFM();
+	$ifm->run();