fix conflict

.github/workflows/tf_update_dev.yml

@@ -0,0 +1,25 @@
+name: Jungleparadise Staging
+on:
+  push:
+    branches: 
+      - development
+
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on www2.jungleparadise.tf
+      uses: appleboy/ssh-action@master
+      with:
+        host: www2.jungleparadise.tf
+        username: ${{ secrets.TF_USER }}
+        key: ${{ secrets.TF_SECRET }}
+        port: ${{ secrets.TF_PORT }}
+        script: |
+          cd websites/www2/www_jungle_paradise/
+          git log -1
+          git restore .
+          git pull
+          bash build.sh

.github/workflows/tf_update_prod.yml

@@ -0,0 +1,25 @@
+name: Jungleparadise Production
+on:
+  push:
+    branches: 
+      - main
+
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on www.jungleparadise.tf
+      uses: appleboy/ssh-action@master
+      with:
+        host: www.jungleparadise.tf
+        username: ${{ secrets.TF_USER }}
+        key: ${{ secrets.TF_SECRET }}
+        port: ${{ secrets.TF_PORT }}
+        script: |
+          cd websites/www_jungle_paradise/
+          git log -1
+          git restore .
+          git pull
+          bash build.sh

config.toml

@@ -1,5 +1,5 @@
 # The URL the site will be built for
-base_url = "https://www.jungle_paradise/"
+base_url = "https://www2.jungleparadise.tf/"
 # Change this to your own URL! Please note this variable **must** be uncommented.
 
 title = "Jungle Paradise"