fix wrong merge
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m13s
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m13s
This commit is contained in:
parent
f5d0b72e18
commit
76800f5a88
|
@ -2,6 +2,7 @@
|
||||||
cd /websites/piquemouche
|
cd /websites/piquemouche
|
||||||
date >> update.log
|
date >> update.log
|
||||||
git fetch >> update.log
|
git fetch >> update.log
|
||||||
git merge master >> update.log
|
git restore . >> update.log
|
||||||
|
git merge origin/master >> update.log
|
||||||
sed -i 's#class="align-left">www.piquemouche.fr<br>#><a href="https://piquemouche.fr">piquemouche.fr</a>#g' *.html >> update.log
|
sed -i 's#class="align-left">www.piquemouche.fr<br>#><a href="https://piquemouche.fr">piquemouche.fr</a>#g' *.html >> update.log
|
||||||
echo '.footer__copyright ul{margin-left:2rem}.footer__copyright{text-transform:none!important;display:flex;flex-direction:row;justify-content:space-around}.footer__copyright>p{display:none}.footer__copyright ul>li{list-style:none}.footer__copyright ul>li:first-child{font-size:1.5em;font-weight:700}.footer__copyright{margin-left:10%;margin-right:10%}body{background: #FFF8D6;}' >> assets/css/style.css
|
echo '.footer__copyright ul{margin-left:2rem}.footer__copyright{text-transform:none!important;display:flex;flex-direction:row;justify-content:space-around}.footer__copyright>p{display:none}.footer__copyright ul>li{list-style:none}.footer__copyright ul>li:first-child{font-size:1.5em;font-weight:700}.footer__copyright{margin-left:10%;margin-right:10%}body{background: #FFF8D6;}' >> assets/css/style.css
|
||||||
|
|
Loading…
Reference in New Issue
Block a user