On Sun, Nov 19, 2017 at 10:00 AM, Dan Smith via chirp_devel chirp_devel@intrepid.danplanet.com wrote:
# HG changeset patch # User Jim Unroe rock.unroe@gmail.com # Date 1510453111 18000 # Node ID d51f87f82911939b418a26ff869637cc04d6abf0 # Parent 0e0470d3e892bfd4818bfb972b8b85d58f2b00d4 [UV-5X3] Update Service Settings Menu
The settings labeled VHF Squelch [0-9] are actually the 220 squelch settings. This patch renames these settings to 220 Squelch [0-9] and adds the missing VHF Squelch [0-9] settings.
related to #5333
Sorry for my extreme tardiness in applying this… I get a conflict when I try. Does this need a rebase perhaps?
If it’s not obvious let me know and I’ll dig in deeper to resolve the conflict.
—Dan
Hi Dan,
It isn't obvious, but that is probably just me. ;-)
Here is what I just did...
hg export tip > 1.patch hg qpop hg qrefresh hg pull -u hg qpush hg export tip > 2.patch
Comparing the 2 files the only difference are lines 3, 4 and 5 (Date/Node ID/Parent) and lines 14, 15 and 16 (diff/---/+++). Would you like me to submit it to see if it makes a difference?
Jim