mirror of
https://github.com/walkxcode/dashboard-icons.git
synced 2025-11-27 15:18:41 +01:00
fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 422.6 41.8" style="enable-background:new 0 0 422.6 41.8" xml:space="preserve"><style type="text/css">.st0{fill:#393939}</style><g><polygon points="58.2 .5 58.2 41.4 109 41.4 109 32.7 67.4 32.7 67.4 25.3 108.8 25.3 108.8 16.6 67.4 16.6 67.4 9.1 109 9.1 109 .5" class="st0"/><polygon points="116.2 .5 116.2 41.4 166.9 41.4 166.9 32.7 125.3 32.7 125.3 25.3 166.7 25.3 166.7 16.6 125.3 16.6 125.3 9.1 166.9 9.1 166.9 .5" class="st0"/><polygon points="232.1 .5 232.1 41.4 282.8 41.4 282.8 32.7 241.2 32.7 241.2 25.3 282.6 25.3 282.6 16.6 241.2 16.6 241.2 9.1 282.8 9.1 282.8 .5" class="st0"/><polygon points="289.7 .5 289.7 9.1 310 9.1 310 41.4 319.1 41.4 319.1 9.1 339.5 9.1 339.5 .5" class="st0"/><rect width="9.2" height="40.9" x="346.4" y=".5" class="st0"/><polygon points="215.7 .5 215.7 29.4 183.3 .5 174.1 .5 174.1 41.4 183.3 41.4 183.3 12.5 215.7 41.4 224.8 41.4 224.8 .5" class="st0"/><path d="M33.4,17.1L51,0.5H37L20.8,16.3H9.2V0.5H0v40.9h9.2V25.5l16.2,0c6.8,0,11.5,1.5,14,4.4c1.5,1.7,2.2,4,2.2,6.9 v4.6h9.2v-4.6c0-5-1.5-9.4-4.4-12.8C43.3,20.5,39,18.1,33.4,17.1" class="st0"/><path d="M407,27.6C407,27.6,407,27.6,407,27.6L407,27.6c-0.1,0.1-0.2,0.2-0.3,0.3c0,0,0,0,0,0 c-2.9,3.1-8.5,5.2-16.3,5.2c-7.3,0-12.7-1.8-15.7-4.6c-0.2-0.2-0.4-0.4-0.6-0.6c-1.6-1.8-2.5-4.1-2.5-7s0.8-5.2,2.5-7 c0.2-0.2,0.4-0.4,0.6-0.6c3-2.7,8.4-4.6,15.7-4.6c7.8,0,13.4,2.1,16.3,5.2c0,0,0,0,0,0c0.1,0.1,0.2,0.2,0.2,0.3l0,0c0,0,0,0,0,0 l8.4-4.1c-0.6-0.9-1.2-1.7-1.9-2.5c0,0,0,0,0,0C408.7,2.6,401,0,390.4,0h0c-10.6,0-18.3,2.6-23.1,7.7c-3.2,3.5-5,8.1-5,13.3 c0,5.2,1.7,9.8,5,13.3c4.7,5.1,12.5,7.7,23.1,7.7h0c10.6,0,18.3-2.6,23.1-7.7l0,0c0,0,0,0,0,0c0.7-0.8,1.3-1.6,1.9-2.5L407,27.6z" class="st0"/></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 422.6 41.8"><style>.st0{fill:#393939}</style><path d="M58.2.5v40.9H109v-8.7H67.4v-7.4h41.4v-8.7H67.4V9.1H109V.5zM116.2.5v40.9h50.7v-8.7h-41.6v-7.4h41.4v-8.7h-41.4V9.1h41.6V.5zM232.1.5v40.9h50.7v-8.7h-41.6v-7.4h41.4v-8.7h-41.4V9.1h41.6V.5zM289.7.5v8.6H310v32.3h9.1V9.1h20.4V.5zM346.4.5h9.2v40.9h-9.2zM215.7.5v28.9L183.3.5h-9.2v40.9h9.2V12.5l32.4 28.9h9.1V.5zM33.4 17.1 51 .5H37L20.8 16.3H9.2V.5H0v40.9h9.2V25.5h16.2c6.8 0 11.5 1.5 14 4.4 1.5 1.7 2.2 4 2.2 6.9v4.6h9.2v-4.6c0-5-1.5-9.4-4.4-12.8-3.1-3.5-7.4-5.9-13-6.9M407 27.6l-.3.3c-2.9 3.1-8.5 5.2-16.3 5.2-7.3 0-12.7-1.8-15.7-4.6l-.6-.6c-1.6-1.8-2.5-4.1-2.5-7s.8-5.2 2.5-7l.6-.6c3-2.7 8.4-4.6 15.7-4.6 7.8 0 13.4 2.1 16.3 5.2.1.1.2.2.2.3l8.4-4.1c-.6-.9-1.2-1.7-1.9-2.5-4.7-5-12.4-7.6-23-7.6s-18.3 2.6-23.1 7.7c-3.2 3.5-5 8.1-5 13.3s1.7 9.8 5 13.3c4.7 5.1 12.5 7.7 23.1 7.7s18.3-2.6 23.1-7.7c.7-.8 1.3-1.6 1.9-2.5z" class="st0"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 998 B |
Reference in New Issue
Block a user