Update update.m

taynambenichio · Aug 16, 2024 · 65b479f · 65b479f
1 parent 9cc2e8a
commit 65b479f
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/BaseBin/launchdhook/src/update.m b/BaseBin/launchdhook/src/update.m
@@ -128,11 +128,7 @@ void jbupdate_update_system_info(void)
 				"struct",
 				"physrw",
 				"perfkrw",
-<<<<<<< HEAD
-        "namecache",
-=======
                 "namecache",
->>>>>>> 6dfcdc2589a303c4d3de52786fbc33da03ae3c5c
 				"amfi_oids",
 				NULL,
 				NULL,
@@ -217,4 +213,4 @@ void jbupdate_finalize_stage2(const char *prevVersion, const char *newVersion)
 	}
 
 	JBFixMobilePermissions();
-}
+}