Fix _nl and _de conflicts with master #2
Conversation
|
@dsand47 Are you able to merge this yourself into your private -move branch? |
|
@silverailscolo Yes I was. However, AppVeyor says that it is unable to build an non-mergable pull request. I suspect this message occurs because the conflict still exists. What we need to do is figure out how to remove the delete of signalling/entryexit/Bundle_de.properties from commit c02ca34. The problem is that I did not do a rename with changes. I created new Bundle... files at the target location that were the result of merging SignalBundle... and entryexit/Bundle... I then deleted entryexit/Bundle... Dave Sand |
|
As the folder |
|
I have decided to start over with a fresh sync from master. The changes have all been applied. I just need to test to make sure that I did not miss something. Dave Sand |
…the last several years. The issue was that the warrant proceeds through Cmd #1, Cmd #2, to Cmd #3, automatically, and if the CPU load is too high, the waitFor() loop never noticed the intermediate state Cmd #2. Tested: $ seq 3000 3499 | taskset -c 0,1,2,3 xargs -n 1 -P 200 -INN -- bash -c "./runtest.csh jmri.jmrit.logix.WarrantTest --settingsdir=/tmp/xset.NN > /tmp/xrun.NN 2>/tmp/xerr.NN" $ grep -l failure /tmp/xrun.3*
Update ESU_LokPilotBasic1.0.xml
…ap_1-4.xml New file, version for decoder without Intellimatic
these are the new values from jmrit.signalling.entryexit in master