Skip to content

Commit

Permalink
Fix: Merge conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
burningtnt committed Dec 22, 2023
1 parent 18e3c0e commit 45a82c0
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.jackhuang.hmcl.ui.construct.ComponentList;
import org.jackhuang.hmcl.ui.construct.ComponentSublist;
import org.jackhuang.hmcl.ui.construct.MultiFileItem;
import org.jackhuang.hmcl.upgrade.UpdateChannel;
import org.jackhuang.hmcl.upgrade.hmcl.UpdateChannel;
import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;

import java.util.Arrays;
Expand Down

0 comments on commit 45a82c0

Please sign in to comment.