Merge

Author: foolsoft

.gitignore

@@ -5,10 +5,5 @@ nbproject/project.properties
 nbproject/project.xml
 includes/js/initFsCMS.js
 .htaccess
-<<<<<<< HEAD
 settings/Settings.php
-settings/dbSettings.php
-=======
-includes/js/initFsCMS.js
->>>>>>> origin/master
-includes/js/initFsCMS.js
+settings/dbSettings.php

includes/js/initFsCMS.js

@@ -5,7 +5,6 @@
 */
 class fsCache
 {
-<<<<<<< HEAD
     /** @var string Path of cache folder */
     private static $_path = PATH_CACHE;
     /** @var string Url of cache folder */
@@ -94,12 +93,4 @@ public static function Clear()
         fsFunctions::DeleteDirectory(self::$_path);
     }
 }
-?>
-=======
-    private $_path = PATH_CACHE;
-    
-    public static function Create()
-    {
-    }
-}
->>>>>>> origin/master
+?>