fix merge

core/systemctrl/src/sctrl_se.c

@@ -66,7 +66,6 @@ SEConfig se_config = {
     .custom_update = 0, // automatic
     .usenodrm = 1, // always true
 
-<<<<<<< HEAD
 	.hibblock = 0,
 	.noanalog = 0,
 	.oldplugin = 0,
@@ -83,24 +82,6 @@ SEConfig se_config = {
 	.wpa2 = 0, /* not used by default */
 	.force_high_memory = 0,
 	.macspoofer = 0, // automatic
-=======
-    .hibblock = 0,
-    .noanalog = 0,
-    .oldplugin = 0,
-    .htmlviewer_custom_save_location = 0, // unused, always false
-    .hide_cfw_dirs = 1, // always true
-    .chn_iso = 1, // always true
-    .msspeed = 0,
-    .slimcolor = 0, // automatic
-    .iso_cache = 0,
-    .iso_cache_size = 0, // automatic
-    .iso_cache_num = 0,
-    .iso_cache_policy = CACHE_POLICY_LRU,
-    .noled = 0, // always false
-    .language = -1, /* -1 as autodetect */
-    .force_high_memory = 0,
-    .macspoofer = 0, // automatic
->>>>>>> e5b5291e1877fe325f0512dcf1f5c0f2abddc542
 };
 
 char *GetUmdFile(void) __attribute__((alias("sctrlSEGetUmdFile")));