Skip to content

Commit 2c5ca7f

Browse files
mckenzieartsmckenziearts
committed
chore: resolve conflits
1 parent 18e39cf commit 2c5ca7f

File tree

1 file changed

+50
-50
lines changed

1 file changed

+50
-50
lines changed

‎resources/views/vendor/mail/html/footer.blade.php

+50-50
Original file line numberDiff line numberDiff line change
@@ -16,56 +16,56 @@
1616
align="center"
1717
>
1818
<tbody>
19-
<tr>
20-
<td>
21-
<a href="{{ route('facebook') }}" target="_blank">
22-
<svg class="social-icon" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
23-
<path fill-rule="evenodd" d="M22 12c0-5.523-4.477-10-10-10S2 6.477 2 12c0 4.991 3.657 9.128 8.438 9.878v-6.987h-2.54V12h2.54V9.797c0-2.506 1.492-3.89 3.777-3.89 1.094 0 2.238.195 2.238.195v2.46h-1.26c-1.243 0-1.63.771-1.63 1.562V12h2.773l-.443 2.89h-2.33v6.988C18.343 21.128 22 16.991 22 12z" clip-rule="evenodd"></path>
24-
</svg>
25-
</a>
26-
</td>
27-
<td width="30" style="font-size:1px;line-height:1px"></td>
28-
<td>
29-
<a href="{{ route('twitter') }}" target="_blank">
30-
<svg class="social-icon" viewBox="0 0 1200 1227" fill="currentColor" aria-hidden="true">
31-
<path d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z" />
32-
</svg>
33-
</a>
34-
</td>
35-
<td width="30" style="font-size:1px;line-height:1px"></td>
36-
<td>
37-
<a href="{{ route('youtube') }}" target="_blank">
38-
<svg class="social-icon" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
39-
<path d="M19.615 3.184c-3.604-.246-11.631-.245-15.23 0C.488 3.45.029 5.804 0 12c.029 6.185.484 8.549 4.385 8.816 3.6.245 11.626.246 15.23 0C23.512 20.55 23.971 18.196 24 12c-.029-6.185-.484-8.549-4.385-8.816zM9 16V8l8 3.993L9 16z"/>
40-
</svg>
41-
</a>
42-
</td>
43-
<td width="30" style="font-size:1px;line-height:1px"></td>
44-
<td>
45-
<a href="{{ route('linkedin') }}" target="_blank">
46-
<svg class="social-icon" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
47-
<path d="M19 0H5a5 5 0 00-5 5v14a5 5 0 005 5h14a5 5 0 005-5V5a5 5 0 00-5-5zM8 19H5V8h3v11zM6.5 6.732c-.966 0-1.75-.79-1.75-1.764s.784-1.764 1.75-1.764 1.75.79 1.75 1.764-.783 1.764-1.75 1.764zM20 19h-3v-5.604c0-3.368-4-3.113-4 0V19h-3V8h3v1.765c1.396-2.586 7-2.777 7 2.476V19z"/>
48-
</svg>
49-
</a>
50-
</td>
51-
<td width="30" style="font-size:1px;line-height:1px"></td>
52-
<td>
53-
<a href="{{ route('github') }}" target="_blank">
54-
<svg class="social-icon" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
55-
<path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd"></path>
56-
</svg>
57-
</a>
58-
</td>
59-
<td width="30" style="font-size:1px;line-height:1px"></td>
60-
<td>
61-
<a href="{{ route('telegram') }}" target="_blank">
62-
<svg class="social-icon" fill="currentColor" viewBox="0 0 20 20" aria-hidden="true">
63-
<path d="M10 20c5.523 0 10-4.477 10-10S15.523 0 10 0 0 4.477 0 10s4.477 10 10 10z" />
64-
<path d="M4.162 9.913s5-2.052 6.734-2.774c.665-.29 2.919-1.214 2.919-1.214s1.04-.405.954.578c-.03.404-.26 1.82-.492 3.352-.346 2.168-.722 4.538-.722 4.538s-.058.665-.55.78c-.49.116-1.3-.404-1.444-.52-.116-.087-2.168-1.387-2.92-2.023-.202-.173-.433-.52.03-.925 1.04-.954 2.283-2.139 3.034-2.89.347-.347.694-1.156-.751-.173a246.647 246.647 0 01-4.075 2.745s-.463.29-1.33.03-1.879-.608-1.879-.608-.693-.433.492-.896z" fill="#fff" />
65-
</svg>
66-
</a>
67-
</td>
68-
</tr>
19+
<tr>
20+
<td>
21+
<a href="https://facebook.com/laravelcm" target="_blank">
22+
<svg class="social-icon" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
23+
<path fill-rule="evenodd" d="M22 12c0-5.523-4.477-10-10-10S2 6.477 2 12c0 4.991 3.657 9.128 8.438 9.878v-6.987h-2.54V12h2.54V9.797c0-2.506 1.492-3.89 3.777-3.89 1.094 0 2.238.195 2.238.195v2.46h-1.26c-1.243 0-1.63.771-1.63 1.562V12h2.773l-.443 2.89h-2.33v6.988C18.343 21.128 22 16.991 22 12z" clip-rule="evenodd"></path>
24+
</svg>
25+
</a>
26+
</td>
27+
<td width="30" style="font-size:1px;line-height:1px"></td>
28+
<td>
29+
<a href="https://x.com/laravelcm?utm_source=laravel.cm" target="_blank">
30+
<svg class="social-icon" viewBox="0 0 1200 1227" fill="currentColor" aria-hidden="true">
31+
<path d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z" />
32+
</svg>
33+
</a>
34+
</td>
35+
<td width="30" style="font-size:1px;line-height:1px"></td>
36+
<td>
37+
<a href="https://www.youtube.com/channel/UCbQPQ8q31uQmuKtyRnATLSw" target="_blank">
38+
<svg class="social-icon" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
39+
<path d="M19.615 3.184c-3.604-.246-11.631-.245-15.23 0C.488 3.45.029 5.804 0 12c.029 6.185.484 8.549 4.385 8.816 3.6.245 11.626.246 15.23 0C23.512 20.55 23.971 18.196 24 12c-.029-6.185-.484-8.549-4.385-8.816zM9 16V8l8 3.993L9 16z"/>
40+
</svg>
41+
</a>
42+
</td>
43+
<td width="30" style="font-size:1px;line-height:1px"></td>
44+
<td>
45+
<a href="https://www.linkedin.com/company/laravel-cameroun" target="_blank">
46+
<svg class="social-icon" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
47+
<path d="M19 0H5a5 5 0 00-5 5v14a5 5 0 005 5h14a5 5 0 005-5V5a5 5 0 00-5-5zM8 19H5V8h3v11zM6.5 6.732c-.966 0-1.75-.79-1.75-1.764s.784-1.764 1.75-1.764 1.75.79 1.75 1.764-.783 1.764-1.75 1.764zM20 19h-3v-5.604c0-3.368-4-3.113-4 0V19h-3V8h3v1.765c1.396-2.586 7-2.777 7 2.476V19z"/>
48+
</svg>
49+
</a>
50+
</td>
51+
<td width="30" style="font-size:1px;line-height:1px"></td>
52+
<td>
53+
<a href="https://github.com/laravelcm" target="_blank">
54+
<svg class="social-icon" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
55+
<path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd"></path>
56+
</svg>
57+
</a>
58+
</td>
59+
<td width="30" style="font-size:1px;line-height:1px"></td>
60+
<td>
61+
<a href="https://t.me/laravelcameroun" target="_blank">
62+
<svg class="social-icon" fill="currentColor" viewBox="0 0 20 20" aria-hidden="true">
63+
<path d="M10 20c5.523 0 10-4.477 10-10S15.523 0 10 0 0 4.477 0 10s4.477 10 10 10z" />
64+
<path d="M4.162 9.913s5-2.052 6.734-2.774c.665-.29 2.919-1.214 2.919-1.214s1.04-.405.954.578c-.03.404-.26 1.82-.492 3.352-.346 2.168-.722 4.538-.722 4.538s-.058.665-.55.78c-.49.116-1.3-.404-1.444-.52-.116-.087-2.168-1.387-2.92-2.023-.202-.173-.433-.52.03-.925 1.04-.954 2.283-2.139 3.034-2.89.347-.347.694-1.156-.751-.173a246.647 246.647 0 01-4.075 2.745s-.463.29-1.33.03-1.879-.608-1.879-.608-.693-.433.492-.896z" fill="#fff" />
65+
</svg>
66+
</a>
67+
</td>
68+
</tr>
6969
</tbody>
7070
</table>
7171
</td>

0 commit comments

Comments
 (0)