fix conflicts

Signed-off-by: Mikhail Scherba <mikhail.scherba@flant.com>
flant · Jun 28, 2024 · 87ae79b · 87ae79b
1 parent b255eec
commit 87ae79b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/module_manager/module_manager.go b/pkg/module_manager/module_manager.go
@@ -429,7 +429,7 @@ func (mm *ModuleManager) RefreshEnabledState(logLabels map[string]string) (*Modu
 	case *fs.FileSystemLoader:
 	default:
 		logEntry.Debugf("non-default module loader detected - applying enabledModules patch")
-		mm.global.SetEnabledModules(mm.enabledModules.GetAll())
+		mm.global.SetEnabledModules(enabledModules)
 	}
 
 	// Return lists for ConvergeModules task.