Merge remote-tracking branch 'origin/delta'

2022-01-18 13:01:31 -06:00 · 2022-01-18 13:01:31 -06:00 · 56a5a7b58a
commit 56a5a7b58a
parent de3fe6cb29 1d652fa3cd
2 changed files with 3 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -202,3 +202,6 @@ plugins/LuckPerms/libs/
 plugins/dynmap/*.pending
 plugins/WorldEdit/.archive-unpack/
 !plugins/LuckPerms/*.db
+
+# Ignore the update script
+update.sh
--- a/update.sh
+++ b/update.sh
@ -1,6 +0,0 @@
-#!/bin/sh
-
-git reset --hard
-git checkout master
-git pull origin master --ff-only
-git checkout master@{'24 hours ago'}