fix: 合并冲突

Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
2024-04-15 15:06:53 +08:00
parent 3a02823ea9
commit c4a622a55c
1 changed files with 1 additions and 0 deletions
--- a/app/src/main/java/com/halo/assistant/HaloApp.java
+++ b/app/src/main/java/com/halo/assistant/HaloApp.java
@ -32,6 +32,7 @@ import com.gh.base.GlobalActivityLifecycleObserver;
 import com.gh.common.FixedRateJobHelper;
 import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.prioritychain.GlobalPriorityChainHelper;
+import com.gh.common.util.ActivationHelper;
 import com.gh.common.util.DataUtils;
 import com.gh.common.util.DeviceTokenUtils;
 import com.gh.common.util.DownloadNotificationHelper;