Skip to content

Commit 3e19fe1

Browse files
committed
pkg/config: remove outdated comment
There is no merge Merge() function and I couldn't find it in the git log either so just remove the comment. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
1 parent ea29562 commit 3e19fe1

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

pkg/config/config.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ type EngineConfig struct {
253253
// and "systemd".
254254
CgroupManager string `toml:"cgroup_manager,omitempty"`
255255

256-
// NOTE: when changing this struct, make sure to update (*Config).Merge().
257-
258256
// ConmonEnvVars are environment variables to pass to the Conmon binary
259257
// when it is launched.
260258
ConmonEnvVars attributedstring.Slice `toml:"conmon_env_vars,omitempty"`

0 commit comments

Comments
 (0)