Merge branch 'main' into dev

oxydev · Jul 22, 2024 · 900d226 · 900d226
2 parents 25c73d2 + 5266f8b
commit 900d226
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/main-dev.yml b/.github/workflows/main-dev.yml
@@ -25,7 +25,11 @@ jobs:
           known_hosts: 'just-a-placeholder-so-we-dont-get-errors'
       - name: Adding Known Hosts
         run: ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
-      - name: connect to our canvas node
-        run: |
-          ssh -tt root@134.209.235.90 'cd /var/www/histopia-landing/static/histopia-statics-dev/ && git pull'
+#       - name: connect to our canvas node
+#         run: |
+# <<<<<<< dev
+#           ssh -tt root@134.209.235.90 'cd /var/www/histopia-landing/static/histopia-statics-dev/ && git pull'
+# =======
+#           ssh -tt root@134.209.235.90 'cd /var/www/histopia-landing-dev/static/histopia-statics/ && git pull'
+# >>>>>>> main
         shell: bash
diff --git a/character/female/shoes/default/picture.png b/character/female/shoes/default/picture.png
diff --git a/character/female/top/default/picture.png b/character/female/top/default/picture.png
diff --git a/character/light and camera/light and camera edited.blend b/character/light and camera/light and camera edited.blend
diff --git a/character/male/mask/default/model.glb b/character/male/mask/default/model.glb