Fixed merge fail - this branch doesn't have javascript_strings.

[rails.git] / config / potlatch / colours.txt

diff --git a/config/potlatch/colours.txt b/config/potlatch/colours.txt
index c54247cb162ce62606493ffdd924046ec3cd4ea3..e69a5b2cc222fda96e8d206a00cf909af9172e8f 100644 (file)
--- a/config/potlatch/colours.txt
+++ b/config/potlatch/colours.txt
@@ -9,9 +9,12 @@ trunk_link             0x7FC97F        1       -
 primary                        0xE46D71        1       -
 primary_link   0xE46D71        1       -
 secondary              0xFDBF6F        1       -
+secondary_link 0xFDBF6F        1       -
 tertiary               0xFEFECB        1       -
+tertiary_link  0xFEFECB        1       -
 unclassified   0xE8E8E8        1       -
 residential            0xE8E8E8        1       -
+road                   0xAAAAAA        1       -
 footway                        0xFF6644        -       -
 cycleway               0xFF6644        -       -
 bridleway              0xFF6644        -       -