fix wrong merge

.gitea/workflows/test.yaml

@@ -0,0 +1,30 @@
+name: Gitea Actions Demo
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+on:
+  push:
+    branches:
+      - 'master'
+      - 'prod'
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
+      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with: 
+          github-server-url: 'https://yuno.oiseauroch.fr/gitea/'
+      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
+      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ gitea.workspace }}
+      - run: echo "🍏 This job's status is ${{ job.status }}."
+      - run: git config user.name "gitea[bot]"
+      - run: git config user.email "gitea[bot]@yuno.oiseauroch.fr"
+      - run: git switch production
+      - run: git merge prod
+      - run: git push origin auto-prod

.gitignore

@@ -0,0 +1,2 @@
+update.log
+*.update

update_site.sh

@@ -0,0 +1,8 @@
+#!/bin/ash
+cd /websites/piquemouche
+date >> update.log
+git fetch >> 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
+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