mirror of
https://github.com/portapack-mayhem/mayhem-firmware.git
synced 2025-04-01 08:12:11 +00:00
fix conflict
This commit is contained in:
commit
961f897eb9
@ -120,10 +120,10 @@ def main():
|
|||||||
if validate_memory_regions(regions):
|
if validate_memory_regions(regions):
|
||||||
print("external app addr seems correct, pass")
|
print("external app addr seems correct, pass")
|
||||||
else:
|
else:
|
||||||
print("\nWARENING: It seems you are having incorrect external app addresses.")
|
print("\nWARNING: It seems you are having incorrect external app addresses.")
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"err: {e}")
|
print(f"err: {e}")
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
@ -199,7 +199,7 @@ try:
|
|||||||
if validate_memory_regions(regions):
|
if validate_memory_regions(regions):
|
||||||
print("external app addr seems correct, pass")
|
print("external app addr seems correct, pass")
|
||||||
else:
|
else:
|
||||||
print("\nWARENING: It seems you are having incorrect external app addresses.")
|
print("\nWARNING: It seems you are having incorrect external app addresses.")
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"err: {e}")
|
print(f"err: {e}")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user