Merge remote-tracking branch 'origin/delta'

Jenkinsfile

@@ -21,7 +21,6 @@ pipeline {
         }
         stage('queue') {
             steps {
-                load './server_ver.groovy'
                 sh 'git checkout master'
 
                 sh 'git reset --hard origin/master'
@@ -32,7 +31,6 @@ pipeline {
                 sh 'git clean -fd'
 
                 sh 'git merge --strategy-option theirs origin/delta'
-                sh 'git tag -a "L$VER_MAJOR.$VER_MINOR.$VER_PATCH" -m "Automatic publish performed by Jenkins."'
                 sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
                     sh 'git push origin master'
                     sh 'git push origin --tags'

server_ver.groovy

@@ -1,3 +0,0 @@
-env.VER_MAJOR=0
-env.VER_MINOR=0
-env.VER_PATCH=16