Removed unecessary merge.

2022-05-13 04:33:27 -05:00
parent 3eaa38abeb
commit 5a4ff41744
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@@ -37,7 +37,6 @@ pipeline {
                branch '**/sync-modpack'
            }
            steps {
-                sh "git merge -X theirs sync-modpack"
                sh "git add mods/**"
                sh "git add config/**"
                sh "git add dynmap/renderdata/**"