Auto-merging via docker-versions-create

# Conflicts:
#	Dockerfile
#	README.md
#	start
#	start-configuration
#	start-deployFTB
This commit is contained in:
Geoff Bourne committed 2020-06-19 15:01:28 -05:00
commit 8493252645
39 files changed
+633 -190

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash
. /start-utils
. ${SCRIPTS:-/}start-utils
if [ -n "$OPS" ]; then
log "Setting/adding ops"