Revert "fix conflict"

This reverts commit 9c0ac00, reversing changes made to 3c2b399.
TeamPiplup · May 1, 2024 · 9ac6237 · 9ac6237
1 parent 9c0ac00
commit 9ac6237
Show file tree

Hide file tree

Showing 10 changed files with 150 additions and 818 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -73,35 +73,3 @@ jobs:
         platforms  : linux/amd64,linux/arm/v7,linux/arm64/v8
         cache-from : type=gha,scope=${{ github.workflow }}
         cache-to   : type=gha,scope=${{ github.workflow }},mode=max
-    -
-      name: Build binary files
-      run: |
-        ./docker-build.sh  all
-    -
-      name : Upload Server
-      uses : actions/upload-artifact@v3
-      with:
-        name              : Server
-        path              : ./bin/Server
-        if-no-files-found : error
-    -
-      name : Upload Server.arm
-      uses : actions/upload-artifact@v3
-      with:
-        name              : Server.arm
-        path              : ./bin/Server.arm
-        if-no-files-found : error
-    -
-      name : Upload Server.arm64
-      uses : actions/upload-artifact@v3
-      with:
-        name              : Server.arm64
-        path              : ./bin/Server.arm64
-        if-no-files-found : error
-    -
-      name : Upload Server.exe
-      uses : actions/upload-artifact@v3
-      with:
-        name              : Server.exe
-        path              : ./bin/Server.exe
-        if-no-files-found : error
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,3 @@ riderModule.iml
 .idea/
 settings.json
 .vs/
-
-/cache/
-/data/
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,3 @@ riderModule.iml @@
     .idea/
     settings.json
     .vs/
-    /cache/
-    /data/