fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,52 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Livello_1" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="0 17.9 512.1 476.2">
|
||||
<style type="text/css">
|
||||
.st0{fill:#0A2767;}
|
||||
.st1{fill:#0364B8;}
|
||||
.st2{fill:#0078D4;}
|
||||
.st3{fill:#28A8EA;}
|
||||
.st4{fill:#14447D;}
|
||||
.st5{fill:url(#SVGID_1_);}
|
||||
.st6{opacity:0.5;fill:#0A2767;enable-background:new ;}
|
||||
.st7{fill:#1490DF;}
|
||||
.st8{opacity:0.1;enable-background:new ;}
|
||||
.st9{opacity:5.000000e-02;enable-background:new ;}
|
||||
.st10{opacity:0.2;enable-background:new ;}
|
||||
.st11{fill:url(#SVGID_00000011745563775910517050000007278537477418533522_);}
|
||||
.st12{fill:#FFFFFF;}
|
||||
.st13{fill:#50D9FF;}
|
||||
</style>
|
||||
<g>
|
||||
<path class="st0" d="M512,267.9c0-4-2-7.7-5.5-9.8h-0.1l-0.2-0.1l-177.4-105c-0.8-0.5-1.6-1-2.4-1.4c-6.9-3.5-15-3.5-21.8,0 c-0.8,0.4-1.6,0.9-2.4,1.4L124.8,258l-0.2,0.1c-5.4,3.4-7.1,10.5-3.7,15.9c1,1.6,2.4,2.9,4,3.9l177.4,105c0.8,0.5,1.6,1,2.4,1.4 c6.9,3.5,15,3.5,21.8,0c0.8-0.4,1.6-0.9,2.4-1.4l177.4-105C509.9,275.8,512,272,512,267.9z"/>
|
||||
<path class="st1" d="M145.5,197.8H262v106.7H145.5V197.8z M488.2,89.3V40.5c0.3-12.2-9.4-22.3-21.6-22.6H164.5 c-12.2,0.3-21.9,10.4-21.6,22.6v48.8l178.6,47.6L488.2,89.3z"/>
|
||||
<path class="st2" d="M142.9,89.3H262v107.2H142.9V89.3z"/>
|
||||
<path class="st3" d="M381,89.3H262v107.2L381,303.6h107.2V196.5L381,89.3z"/>
|
||||
<path class="st2" d="M262,196.5H381v107.2H262V196.5z"/>
|
||||
<path class="st1" d="M262,303.6H381v107.2H262V303.6z"/>
|
||||
<path class="st4" d="M145.5,304.5H262v97H145.5V304.5z"/>
|
||||
<path class="st2" d="M381,303.6h107.2v107.2H381V303.6z"/>
|
||||
|
||||
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="315.5343" y1="-645.4268" x2="315.5343" y2="-419.1937" gradientTransform="matrix(1 0 0 1 0 913.3334)">
|
||||
<stop offset="0" style="stop-color:#35B8F1"/>
|
||||
<stop offset="1" style="stop-color:#28A8EA"/>
|
||||
</linearGradient>
|
||||
<path class="st5" d="M506.5,277.2l-0.2,0.1l-177.4,99.8c-0.8,0.5-1.6,0.9-2.4,1.3c-3,1.4-6.3,2.2-9.6,2.4l-9.7-5.7 c-0.8-0.4-1.6-0.9-2.4-1.4L125,271.2H125l-5.9-3.3v202c0.1,13.5,11.1,24.3,24.6,24.2h344.2c0.2,0,0.4-0.1,0.6-0.1 c2.8-0.2,5.7-0.8,8.3-1.7c1.2-0.5,2.3-1.1,3.3-1.7c0.8-0.5,2.2-1.4,2.2-1.4c6.1-4.5,9.7-11.6,9.7-19.2v-202 C512,271.8,509.9,275.3,506.5,277.2z"/>
|
||||
<path class="st6" d="M502.5,267.1v12.4L317,407.2L124.9,271.3c0-0.1-0.1-0.1-0.1-0.1l0,0l-17.6-10.6v-8.9l7.3-0.1l15.4,8.8l0.4,0.1 l1.3,0.8c0,0,180.5,103,181,103.2l6.9,4c0.6-0.2,1.2-0.5,1.9-0.7c0.4-0.2,179.2-100.9,179.2-100.9L502.5,267.1z"/>
|
||||
<path class="st7" d="M506.5,277.2l-0.2,0.1l-177.4,99.8c-0.8,0.5-1.6,0.9-2.4,1.3c-6.9,3.4-14.9,3.4-21.8,0 c-0.8-0.4-1.6-0.8-2.4-1.3l-177.4-99.8l-0.2-0.1c-3.4-1.9-5.6-5.4-5.6-9.3v202c0.1,13.5,11.1,24.3,24.6,24.2c0,0,0,0,0,0h343.8 c13.5,0.1,24.5-10.8,24.6-24.2c0,0,0,0,0,0v-202C512,271.8,509.9,275.3,506.5,277.2z"/>
|
||||
<path class="st8" d="M331.5,375.7l-2.7,1.5c-0.8,0.5-1.6,0.9-2.4,1.3c-2.9,1.4-6.1,2.3-9.4,2.5l67.5,79.8l117.7,28.4 c3.2-2.4,5.8-5.6,7.5-9.3L331.5,375.7z"/>
|
||||
<path class="st9" d="M343.5,368.9l-14.7,8.3c-0.8,0.5-1.6,0.9-2.4,1.3c-2.9,1.4-6.1,2.3-9.4,2.5l31.6,87.2l153.7,21 c6.1-4.5,9.6-11.7,9.6-19.2v-2.6L343.5,368.9z"/>
|
||||
<path class="st3" d="M144,494.1h343.5c5.3,0,10.4-1.6,14.7-4.8L307.2,375.2c-0.8-0.4-1.6-0.9-2.4-1.4L125,271.2h-0.1l-5.9-3.3 v201.3C119.1,483,130.2,494.1,144,494.1C144,494.1,144,494.1,144,494.1z"/>
|
||||
<path class="st8" d="M285.8,134.9v254c0,8.9-5.4,16.9-13.7,20.2c-2.6,1.1-5.3,1.7-8.1,1.7H119.1V125h23.8v-11.9H264 C276,113.2,285.7,122.9,285.8,134.9z"/>
|
||||
<path class="st10" d="M273.9,146.8v254c0,2.9-0.6,5.7-1.8,8.3c-3.3,8.2-11.2,13.5-20,13.5h-133V125h133c3.5,0,6.9,0.8,9.9,2.5 C269.3,131.2,273.9,138.7,273.9,146.8z"/>
|
||||
<path class="st10" d="M273.9,146.8V377c-0.1,12-9.8,21.8-21.8,21.9h-133V125h133c3.5,0,6.9,0.8,9.9,2.5 C269.3,131.2,273.9,138.7,273.9,146.8z"/>
|
||||
<path class="st10" d="M262,146.8V377c0,12-9.7,21.8-21.8,21.9H119.1V125h121.1C252.2,125,262,134.8,262,146.8 C262,146.8,262,146.8,262,146.8z"/>
|
||||
|
||||
<linearGradient id="SVGID_00000020390704350043793700000005331933725794237602_" gradientUnits="userSpaceOnUse" x1="45.5066" y1="-805.3643" x2="216.4466" y2="-509.3031" gradientTransform="matrix(1 0 0 1 0 913.3334)">
|
||||
<stop offset="0" style="stop-color:#1784D9"/>
|
||||
<stop offset="0.5" style="stop-color:#107AD5"/>
|
||||
<stop offset="1" style="stop-color:#0A63C9"/>
|
||||
</linearGradient>
|
||||
<path style="fill:url(#SVGID_00000020390704350043793700000005331933725794237602_);" d="M21.8,125h218.3 c12.1,0,21.8,9.8,21.8,21.8v218.3c0,12.1-9.8,21.8-21.8,21.8H21.8C9.8,387,0,377.2,0,365.2V146.8C0,134.8,9.8,125,21.8,125z"/>
|
||||
<path class="st12" d="M68.2,216.6c5.4-11.5,14.1-21.1,24.9-27.5c12-6.9,25.7-10.3,39.6-9.9c12.9-0.3,25.5,3,36.7,9.4 c10.5,6.2,18.9,15.4,24.3,26.3c5.8,12,8.8,25.3,8.5,38.7c0.3,14-2.7,27.9-8.8,40.5c-5.5,11.3-14.2,20.8-25,27.2 c-11.6,6.6-24.7,10-38,9.7c-13.1,0.3-26.1-3-37.5-9.5C82.4,315.1,73.8,306,68.3,295c-5.9-11.9-8.8-25-8.6-38.2 C59.5,242.9,62.4,229.2,68.2,216.6z M94.8,281.2c2.9,7.2,7.7,13.5,14,18.1c6.4,4.5,14.1,6.8,21.9,6.6c8.3,0.3,16.5-2.1,23.4-6.8 c6.2-4.6,11-10.9,13.6-18.1c3-8.1,4.5-16.7,4.3-25.3c0.1-8.7-1.3-17.4-4.1-25.6c-2.5-7.4-7.1-14-13.2-18.9 c-6.7-5-14.9-7.5-23.2-7.1c-8-0.2-15.8,2.1-22.4,6.7c-6.4,4.6-11.4,11-14.3,18.3C88.4,245.8,88.4,264.4,94.8,281.2L94.8,281.2z"/>
|
||||
<path class="st13" d="M381,89.3h107.2v107.2H381V89.3z"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Livello_1" x="0" y="0" version="1.1" viewBox="0 17.9 512.1 476.2"><style>.st1{fill:#0364b8}.st2{fill:#0078d4}.st3{fill:#28a8ea}.st10,.st8{opacity:.1;enable-background:new}.st10{opacity:.2}</style><path d="M512 267.9c0-4-2-7.7-5.5-9.8h-.1l-.2-.1-177.4-105c-.8-.5-1.6-1-2.4-1.4-6.9-3.5-15-3.5-21.8 0-.8.4-1.6.9-2.4 1.4L124.8 258l-.2.1c-5.4 3.4-7.1 10.5-3.7 15.9 1 1.6 2.4 2.9 4 3.9l177.4 105c.8.5 1.6 1 2.4 1.4 6.9 3.5 15 3.5 21.8 0 .8-.4 1.6-.9 2.4-1.4l177.4-105c3.6-2.1 5.7-5.9 5.7-10" style="fill:#0a2767"/><path d="M145.5 197.8H262v106.7H145.5zM488.2 89.3V40.5c.3-12.2-9.4-22.3-21.6-22.6H164.5c-12.2.3-21.9 10.4-21.6 22.6v48.8l178.6 47.6z" class="st1"/><path d="M142.9 89.3H262v107.2H142.9z" class="st2"/><path d="M381 89.3H262v107.2l119 107.1h107.2V196.5z" class="st3"/><path d="M262 196.5h119v107.2H262z" class="st2"/><path d="M262 303.6h119v107.2H262z" class="st1"/><path d="M145.5 304.5H262v97H145.5z" style="fill:#14447d"/><path d="M381 303.6h107.2v107.2H381z" class="st2"/><linearGradient id="SVGID_1_" x1="315.534" x2="315.534" y1="-645.427" y2="-419.194" gradientTransform="translate(0 913.333)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#35b8f1"/><stop offset="1" style="stop-color:#28a8ea"/></linearGradient><path d="m506.5 277.2-.2.1-177.4 99.8c-.8.5-1.6.9-2.4 1.3-3 1.4-6.3 2.2-9.6 2.4l-9.7-5.7c-.8-.4-1.6-.9-2.4-1.4L125 271.2l-5.9-3.3v202c.1 13.5 11.1 24.3 24.6 24.2h344.2c.2 0 .4-.1.6-.1 2.8-.2 5.7-.8 8.3-1.7 1.2-.5 2.3-1.1 3.3-1.7.8-.5 2.2-1.4 2.2-1.4 6.1-4.5 9.7-11.6 9.7-19.2V268c0 3.8-2.1 7.3-5.5 9.2" style="fill:url(#SVGID_1_)"/><path d="M502.5 267.1v12.4L317 407.2 124.9 271.3c0-.1-.1-.1-.1-.1l-17.6-10.6v-8.9l7.3-.1 15.4 8.8.4.1 1.3.8s180.5 103 181 103.2l6.9 4c.6-.2 1.2-.5 1.9-.7.4-.2 179.2-100.9 179.2-100.9z" style="opacity:.5;fill:#0a2767"/><path d="m506.5 277.2-.2.1-177.4 99.8c-.8.5-1.6.9-2.4 1.3-6.9 3.4-14.9 3.4-21.8 0-.8-.4-1.6-.8-2.4-1.3l-177.4-99.8-.2-.1c-3.4-1.9-5.6-5.4-5.6-9.3v202c.1 13.5 11.1 24.3 24.6 24.2h343.8c13.5.1 24.5-10.8 24.6-24.2v-202c-.1 3.9-2.2 7.4-5.6 9.3" style="fill:#1490df"/><path d="m331.5 375.7-2.7 1.5c-.8.5-1.6.9-2.4 1.3-2.9 1.4-6.1 2.3-9.4 2.5l67.5 79.8 117.7 28.4c3.2-2.4 5.8-5.6 7.5-9.3z" class="st8"/><path d="m343.5 368.9-14.7 8.3c-.8.5-1.6.9-2.4 1.3-2.9 1.4-6.1 2.3-9.4 2.5l31.6 87.2 153.7 21c6.1-4.5 9.6-11.7 9.6-19.2v-2.6z" style="opacity:5.000000e-02"/><path d="M144 494.1h343.5c5.3 0 10.4-1.6 14.7-4.8l-195-114.1c-.8-.4-1.6-.9-2.4-1.4L125 271.2h-.1l-5.9-3.3v201.3c.1 13.8 11.2 24.9 25 24.9" class="st3"/><path d="M285.8 134.9v254c0 8.9-5.4 16.9-13.7 20.2-2.6 1.1-5.3 1.7-8.1 1.7H119.1V125h23.8v-11.9H264c12 .1 21.7 9.8 21.8 21.8" class="st8"/><path d="M273.9 146.8v254c0 2.9-.6 5.7-1.8 8.3-3.3 8.2-11.2 13.5-20 13.5h-133V125h133c3.5 0 6.9.8 9.9 2.5 7.3 3.7 11.9 11.2 11.9 19.3" class="st10"/><path d="M273.9 146.8V377c-.1 12-9.8 21.8-21.8 21.9h-133V125h133c3.5 0 6.9.8 9.9 2.5 7.3 3.7 11.9 11.2 11.9 19.3" class="st10"/><path d="M262 146.8V377c0 12-9.7 21.8-21.8 21.9H119.1V125h121.1c12 0 21.8 9.8 21.8 21.8" class="st10"/><linearGradient id="SVGID_00000020390704350043793700000005331933725794237602_" x1="45.507" x2="216.447" y1="-805.364" y2="-509.303" gradientTransform="translate(0 913.333)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#1784d9"/><stop offset=".5" style="stop-color:#107ad5"/><stop offset="1" style="stop-color:#0a63c9"/></linearGradient><path d="M21.8 125h218.3c12.1 0 21.8 9.8 21.8 21.8v218.3c0 12.1-9.8 21.8-21.8 21.8H21.8C9.8 387 0 377.2 0 365.2V146.8c0-12 9.8-21.8 21.8-21.8" style="fill:url(#SVGID_00000020390704350043793700000005331933725794237602_)"/><path d="M68.2 216.6c5.4-11.5 14.1-21.1 24.9-27.5 12-6.9 25.7-10.3 39.6-9.9 12.9-.3 25.5 3 36.7 9.4 10.5 6.2 18.9 15.4 24.3 26.3 5.8 12 8.8 25.3 8.5 38.7.3 14-2.7 27.9-8.8 40.5-5.5 11.3-14.2 20.8-25 27.2-11.6 6.6-24.7 10-38 9.7-13.1.3-26.1-3-37.5-9.5-10.5-6.4-19.1-15.5-24.6-26.5-5.9-11.9-8.8-25-8.6-38.2-.2-13.9 2.7-27.6 8.5-40.2m26.6 64.6c2.9 7.2 7.7 13.5 14 18.1 6.4 4.5 14.1 6.8 21.9 6.6 8.3.3 16.5-2.1 23.4-6.8 6.2-4.6 11-10.9 13.6-18.1 3-8.1 4.5-16.7 4.3-25.3.1-8.7-1.3-17.4-4.1-25.6-2.5-7.4-7.1-14-13.2-18.9-6.7-5-14.9-7.5-23.2-7.1-8-.2-15.8 2.1-22.4 6.7-6.4 4.6-11.4 11-14.3 18.3-6.4 16.7-6.4 35.3 0 52.1" style="fill:#fff"/><path d="M381 89.3h107.2v107.2H381z" style="fill:#50d9ff"/></svg>
|
||||
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 4.3 KiB |
Reference in New Issue
Block a user