Merge branch 'master' into engine

This commit is contained in:
Adrian Gallagher
2019-11-11 17:11:11 +11:00
53 changed files with 96 additions and 168 deletions

View File

@@ -420,7 +420,6 @@ func GetExcludedItems() (Exclusion, error) {
if mErr != nil {
return excludedList, mErr
}
} else {
err = json.Unmarshal(file, &excludedList)
if err != nil {