Modified .gitignore and deploy.yml.

.forgejo/workflows/deploy.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: docker
+    runs-on: ubuntu-latest
     steps:
       - name: 📥 Checkout code
         uses: actions/checkout@v3

.gitignore

@@ -91,7 +91,6 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
-<<<<<<< Updated upstream
 # Node/npm
 node_modules/
 npm-debug.log
@@ -99,6 +98,6 @@ npm-debug.log
 .env
 dist/
 coverage/
-=======
+
+# Cletus' database
 bot/db/
->>>>>>> Stashed changes