Skip to content

Commit 0b0fb5a

Browse files
memo33memo33
committed
update conflicting-override tags in RUL2 files
Using the script: sbt "conflictingOverridesCheck --update" The removal of redundant adjacencies in previous commits also removed a lot of conflicts: Found 39173 conflicting RUL2 overrides (removed 37303, added 81).
1 parent 134a340 commit 0b0fb5a

442 files changed

Lines changed: 37420 additions & 37420 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Controller/RUL2/03_Turn_Lanes/Sec3d_FTL.txt‎

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

‎Controller/RUL2/03_Turn_Lanes/Sec3j_FTL_RHW_Crossings_FTL-Side.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34510,56 +34510,56 @@
3451034510

3451134511
0x57D2CA80,2,0,0x57111100,2,0=0x57D2CA80,2,0,0x5B411701,0,0
3451234512
0x57D2CA89,2,0,0x57111100,2,0=0x57D2CA89,2,0,0x5B411701,0,0
34513-
0x57D2CB80,2,0,0x57111100,0,0=0x57D2CB80,2,0,0x5B411701,2,0; conflicting-override
34514-
0x57D2CB89,2,0,0x57111100,0,0=0x57D2CB89,2,0,0x5B411701,2,0; conflicting-override
34513+
0x57D2CB80,2,0,0x57111100,0,0=0x57D2CB80,2,0,0x5B411701,2,0
34514+
0x57D2CB89,2,0,0x57111100,0,0=0x57D2CB89,2,0,0x5B411701,2,0
3451534515
0x57D2CA80,2,0,0x57111100,2,0=0x57D2CA80,2,0,0x5B411700,2,0; conflicting-override
3451634516
0x57D2CA89,2,0,0x57111100,2,0=0x57D2CA89,2,0,0x5B411700,2,0; conflicting-override
3451734517
0x57D2CA80,2,0,0x57111110,2,0=0x57D2CA80,2,0,0x5B411701,0,0
3451834518
0x57D2CA89,2,0,0x57111110,2,0=0x57D2CA89,2,0,0x5B411701,0,0
34519-
0x57D2CB80,2,0,0x57111110,0,0=0x57D2CB80,2,0,0x5B411701,2,0; conflicting-override
34520-
0x57D2CB89,2,0,0x57111110,0,0=0x57D2CB89,2,0,0x5B411701,2,0; conflicting-override
34519+
0x57D2CB80,2,0,0x57111110,0,0=0x57D2CB80,2,0,0x5B411701,2,0
34520+
0x57D2CB89,2,0,0x57111110,0,0=0x57D2CB89,2,0,0x5B411701,2,0
3452134521
0x57D2CA80,2,0,0x57111110,2,0=0x57D2CA80,2,0,0x5B411700,2,0; conflicting-override
3452234522
0x57D2CA89,2,0,0x57111110,2,0=0x57D2CA89,2,0,0x5B411700,2,0; conflicting-override
3452334523

3452434524

3452534525
0x57D2CA80,2,0,0x57121100,2,0=0x57D2CA80,2,0,0x5B412701,0,0
3452634526
0x57D2CA89,2,0,0x57121100,2,0=0x57D2CA89,2,0,0x5B412701,0,0
34527-
0x57D2CB80,2,0,0x57121100,0,0=0x57D2CB80,2,0,0x5B412701,2,0; conflicting-override
34528-
0x57D2CB89,2,0,0x57121100,0,0=0x57D2CB89,2,0,0x5B412701,2,0; conflicting-override
34527+
0x57D2CB80,2,0,0x57121100,0,0=0x57D2CB80,2,0,0x5B412701,2,0
34528+
0x57D2CB89,2,0,0x57121100,0,0=0x57D2CB89,2,0,0x5B412701,2,0
3452934529
0x57D2CA80,2,0,0x57121100,2,0=0x57D2CA80,2,0,0x5B412700,2,0; conflicting-override
3453034530
0x57D2CA89,2,0,0x57121100,2,0=0x57D2CA89,2,0,0x5B412700,2,0; conflicting-override
3453134531
0x57D2CA80,2,0,0x57121110,2,0=0x57D2CA80,2,0,0x5B412701,0,0
3453234532
0x57D2CA89,2,0,0x57121110,2,0=0x57D2CA89,2,0,0x5B412701,0,0
34533-
0x57D2CB80,2,0,0x57121110,0,0=0x57D2CB80,2,0,0x5B412701,2,0; conflicting-override
34534-
0x57D2CB89,2,0,0x57121110,0,0=0x57D2CB89,2,0,0x5B412701,2,0; conflicting-override
34533+
0x57D2CB80,2,0,0x57121110,0,0=0x57D2CB80,2,0,0x5B412701,2,0
34534+
0x57D2CB89,2,0,0x57121110,0,0=0x57D2CB89,2,0,0x5B412701,2,0
3453534535
0x57D2CA80,2,0,0x57121110,2,0=0x57D2CA80,2,0,0x5B412700,2,0; conflicting-override
3453634536
0x57D2CA89,2,0,0x57121110,2,0=0x57D2CA89,2,0,0x5B412700,2,0; conflicting-override
3453734537

3453834538

3453934539
0x57D2CA80,2,0,0x57131100,2,0=0x57D2CA80,2,0,0x5B413701,0,0
3454034540
0x57D2CA89,2,0,0x57131100,2,0=0x57D2CA89,2,0,0x5B413701,0,0
34541-
0x57D2CB80,2,0,0x57131100,0,0=0x57D2CB80,2,0,0x5B413701,2,0; conflicting-override
34542-
0x57D2CB89,2,0,0x57131100,0,0=0x57D2CB89,2,0,0x5B413701,2,0; conflicting-override
34541+
0x57D2CB80,2,0,0x57131100,0,0=0x57D2CB80,2,0,0x5B413701,2,0
34542+
0x57D2CB89,2,0,0x57131100,0,0=0x57D2CB89,2,0,0x5B413701,2,0
3454334543
0x57D2CA80,2,0,0x57131100,2,0=0x57D2CA80,2,0,0x5B413700,2,0; conflicting-override
3454434544
0x57D2CA89,2,0,0x57131100,2,0=0x57D2CA89,2,0,0x5B413700,2,0; conflicting-override
3454534545
0x57D2CA80,2,0,0x57131110,2,0=0x57D2CA80,2,0,0x5B413701,0,0
3454634546
0x57D2CA89,2,0,0x57131110,2,0=0x57D2CA89,2,0,0x5B413701,0,0
34547-
0x57D2CB80,2,0,0x57131110,0,0=0x57D2CB80,2,0,0x5B413701,2,0; conflicting-override
34548-
0x57D2CB89,2,0,0x57131110,0,0=0x57D2CB89,2,0,0x5B413701,2,0; conflicting-override
34547+
0x57D2CB80,2,0,0x57131110,0,0=0x57D2CB80,2,0,0x5B413701,2,0
34548+
0x57D2CB89,2,0,0x57131110,0,0=0x57D2CB89,2,0,0x5B413701,2,0
3454934549
0x57D2CA80,2,0,0x57131110,2,0=0x57D2CA80,2,0,0x5B413700,2,0; conflicting-override
3455034550
0x57D2CA89,2,0,0x57131110,2,0=0x57D2CA89,2,0,0x5B413700,2,0; conflicting-override
3455134551

3455234552

3455334553
0x57D2CA80,2,0,0x57141100,2,0=0x57D2CA80,2,0,0x5B414701,0,0
3455434554
0x57D2CA89,2,0,0x57141100,2,0=0x57D2CA89,2,0,0x5B414701,0,0
34555-
0x57D2CB80,2,0,0x57141100,0,0=0x57D2CB80,2,0,0x5B414701,2,0; conflicting-override
34556-
0x57D2CB89,2,0,0x57141100,0,0=0x57D2CB89,2,0,0x5B414701,2,0; conflicting-override
34555+
0x57D2CB80,2,0,0x57141100,0,0=0x57D2CB80,2,0,0x5B414701,2,0
34556+
0x57D2CB89,2,0,0x57141100,0,0=0x57D2CB89,2,0,0x5B414701,2,0
3455734557
0x57D2CA80,2,0,0x57141100,2,0=0x57D2CA80,2,0,0x5B414700,2,0; conflicting-override
3455834558
0x57D2CA89,2,0,0x57141100,2,0=0x57D2CA89,2,0,0x5B414700,2,0; conflicting-override
3455934559
0x57D2CA80,2,0,0x57141110,2,0=0x57D2CA80,2,0,0x5B414701,0,0
3456034560
0x57D2CA89,2,0,0x57141110,2,0=0x57D2CA89,2,0,0x5B414701,0,0
34561-
0x57D2CB80,2,0,0x57141110,0,0=0x57D2CB80,2,0,0x5B414701,2,0; conflicting-override
34562-
0x57D2CB89,2,0,0x57141110,0,0=0x57D2CB89,2,0,0x5B414701,2,0; conflicting-override
34561+
0x57D2CB80,2,0,0x57141110,0,0=0x57D2CB80,2,0,0x5B414701,2,0
34562+
0x57D2CB89,2,0,0x57141110,0,0=0x57D2CB89,2,0,0x5B414701,2,0
3456334563
0x57D2CA80,2,0,0x57141110,2,0=0x57D2CA80,2,0,0x5B414700,2,0; conflicting-override
3456434564
0x57D2CA89,2,0,0x57141110,2,0=0x57D2CA89,2,0,0x5B414700,2,0; conflicting-override
3456534565

0 commit comments

Comments
 (0)