mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-19 08:52:15 +00:00
9f4a296310
xCAT-server/lib/xcat/plugins/anaconda.pm conflicted in the module imports: this branch adds "use xCAT::MediaPerms" and master adds "use xCAT::SELinux" on the same line. Both imports are kept. The two modules are used in different subs, and no other hunk conflicted. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>