# HG changeset patch
# User heinrichsweikamp
# Date 1590421010 -7200
# Node ID a3b21497d17e464b969964fc7f2ba1dfca39fd86
# Parent  2737ddc643bb2d32ff4a5e83211c1874d2c8ebad# Parent  cdff88f5a4a0d80e663f66f7a1a203189545f848
Merge

diff -r 2737ddc643bb -r a3b21497d17e src/configuration.inc
diff -r 2737ddc643bb -r a3b21497d17e src/menu_tree.asm