To ...
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:...'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.RewriteEngine On
Options -Indexes
DirectoryIndex prepend.php
RewriteCond %{SERVER_PORT} !^443$
RewriteRule ^(.*)$ https://%{HTTP_HOST}/$1 [QSA,R=301,L]
RewriteRule ^errors/([0-9]+)/? errors.php?e=$1 [L]
RewriteRule ^js/(.*)$ /resource/js/$1
RewriteRule ^css/(.*)$ /resource/css/$1
RewriteRule ^templater/(.*)$ /resource/html/templater/$1
RewriteRule ^img/(.*)$ /resource/img/$1
RewriteRule ^cache.manifest$ /resource/cache.manifest
RewriteRule ^_oauth/facebook$ /prepend.php?c=facebook&%{QUERY_STRING}
RewriteRule ^_oauth/go$ /prepend.php?c=go&%{QUERY_STRING}
RewriteRule ^manifest-st.json$ /resource/manifest-st.json
RewriteRule ^robots.txt$ /resource/robots.txt
RewriteRule ^sitemap.xml$ /resource/sitemap.xml
RewriteRule ^sw.js$ /resource/sw.js
RewriteRule ^favicon.ico$ /resource/img/favicon.ico
AddType text/cache-manifest .appcache
AddType text/html .tpl
<IfModule mod_headers.c>
Header set Access-Control-Allow-Origin "*"
</IfModule>
<IfModule mod_expires.c>
ExpiresActive on
ExpiresByType image/jpg "access plus 1 year"
ExpiresByType text/cache-manifest "access plus 0 seconds"
ExpiresByType image/png "access plus 1 year"
ExpiresByType application/pdf "access plus 1 year"
ExpiresByType text/x-javascript "access plus 1 year"
ExpiresByType application/x-shockwave-flash "access plus 1 year"
ExpiresByType image/x-icon "access plus 1 year"
ExpiresDefault "access plus 1 year"
ExpiresByType text/html "access plus 1 year"
ExpiresByType audio/ogg "access plus 1 year"
ExpiresByType image/gif "access plus 1 year"
ExpiresByType image/jpeg "access plus 1 year"
ExpiresByType video/mp4 "access plus 1 year"
ExpiresByType video/ogg "access plus 1 year"
ExpiresByType video/webm "access plus 1 year"
ExpiresByType application/javascript "access plus 1 year"
ExpiresByType text/css "access plus 1 year"
</IfModule>$dbre=mysql_query("
SELECT value
FROM SC_local
WHERE
(id='credit_mail_title' OR id='email_hello')
");
function mysql_fetch_all($result) {
while($row=mysql_fetch_array($result)) {
$return[] = $row;
}
return $return;
}
print_r(mysql_fetch_all($dbre));
$dbres = mysql_query("
SELECT *
FROM SC_local
WHERE
(id='credit_mail_title' OR id='email_hello')
");
$credit_fetch_lan=mysql_fetch_row($dbres);
print_r($credit_fetch_lan);
git pull branch ?