Skip to content

Commit

Permalink
Fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
math1985 committed Mar 29, 2018
1 parent cf3e03e commit 65ab877
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions admin.mss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ overlapping borders correctly.
background/line-simplify-algorithm: @admin-simplify-algorithm;
line-join: bevel;
line-color: @admin-boundaries;
[maritime = 'true'] {
[maritime = 'yes'] {
line-color: @admin-boundaries-maritime;
}
line-width: 0.6;
Expand Down Expand Up @@ -125,7 +125,7 @@ overlapping borders correctly.
background/line-simplify-algorithm: @admin-simplify-algorithm;
line-join: bevel;
line-color: @admin-boundaries;
[maritime = 'true'] {
[maritime = 'yes'] {
line-color: @admin-boundaries-maritime;
}
line-width: 0.7;
Expand All @@ -144,7 +144,7 @@ overlapping borders correctly.
background/line-simplify-algorithm: @admin-simplify-algorithm;
line-join: bevel;
line-color: @admin-boundaries;
[maritime = 'true'] {
[maritime = 'yes'] {
line-color: @admin-boundaries-maritime;
}
line-width: 0.7;
Expand All @@ -165,7 +165,7 @@ overlapping borders correctly.
background/line-simplify-algorithm: @admin-simplify-algorithm;
line-join: bevel;
line-color: @admin-boundaries;
[maritime = 'true'] {
[maritime = 'yes'] {
line-color: @admin-boundaries-maritime;
}
line-width: 0.7;
Expand All @@ -192,7 +192,7 @@ overlapping borders correctly.
background/line-simplify-algorithm: @admin-simplify-algorithm;
line-join: bevel;
line-color: @admin-boundaries;
[maritime = 'true'] {
[maritime = 'yes'] {
line-color: @admin-boundaries-maritime;
}
line-width: 0.4;
Expand Down

0 comments on commit 65ab877

Please sign in to comment.