mirror of
https://github.com/CloverHackyColor/CloverBootloader.git
synced 2025-01-27 21:51:31 +01:00
merge conflict
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
commit
32ec9183d5
@ -5075,9 +5075,7 @@ GetUserSettings(
|
||||
Prop3 = NULL;
|
||||
DevProps = *Child;
|
||||
*Child = (__typeof_am__(*Child))AllocateZeroPool(sizeof(**Child));
|
||||
DBG("created *Child sizeof %d\n", sizeof(**Child));
|
||||
|
||||
// *Child = new (__typeof_am__(**Child));
|
||||
//*Child = new (__typeof_am__(**Child));
|
||||
(*Child)->Next = DevProps;
|
||||
|
||||
if (EFI_ERROR(GetElement(Prop2, j, &Prop3))) { // Prop3 -> <key>
|
||||
|
Loading…
Reference in New Issue
Block a user