ydeng/rsemcs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unecessary merge.

Browse Source
This commit is contained in:
Harrison Deng 2022-05-13 04:33:27 -05:00
parent 3eaa38abeb
commit 5a4ff41744
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -37,7 +37,6 @@ pipeline {
branch '**/sync-modpack' branch '**/sync-modpack'
} }
steps { steps {
sh "git merge -X theirs sync-modpack"
sh "git add mods/**" sh "git add mods/**"
sh "git add config/**" sh "git add config/**"
sh "git add dynmap/renderdata/**" sh "git add dynmap/renderdata/**"