diff --git a/.gitignore b/.gitignore index adea052c..f4e60abf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ .sass-cache +/data/config.php /web/css/* /log -/data/secret /web/zohoverify nbproject diff --git a/update.php b/update.php index 538fd48c..35aee7f0 100755 --- a/update.php +++ b/update.php @@ -5,8 +5,7 @@ include __DIR__.'/bootstrap.php'; chdir(ROOT_DIR); -Shell::exec('rm ./web/css/*'); -Shell::exec('git checkout master && git pull'); +Shell::exec('git fetch && git reset --hard origin/master'); $scss = new \Leafo\ScssPhp\Compiler(); diff --git a/view/mail/joinList.php b/view/mail/joinList.php index 98cada69..e831fca8 100644 --- a/view/mail/joinList.php +++ b/view/mail/joinList.php @@ -1,3 +1,4 @@ +
\ No newline at end of file +