Cleanup merge conflicts and update package script

This commit is contained in:
nitrohorse
2019-08-03 15:48:42 -07:00
parent 635152fbb1
commit 2a96893aca
5 changed files with 457 additions and 457 deletions

View File

@ -93,7 +93,7 @@
</td> </td>
<td> <td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a> <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 " height="35"></a>
</td> </td>
<td data-value="2014">2014</td> <td data-value="2014">2014</td>
<td><span class="flag-icon flag-icon-de"></span> Germany</td> <td><span class="flag-icon flag-icon-de"></span> Germany</td>

View File

@ -204,7 +204,7 @@
<tr> <tr>
<td data-value="ProtonVPN"> <td data-value="ProtonVPN">
<a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a > <a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a>
</td> </td>
<td> <td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonvpn.com/" href="https://protonvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a> <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonvpn.com/" href="https://protonvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>

View File

@ -9,7 +9,7 @@
"scripts": { "scripts": {
"build": "bundle exec jekyll build", "build": "bundle exec jekyll build",
"serve": "bundle exec jekyll serve", "serve": "bundle exec jekyll serve",
"html-beautify": "node_modules/.bin/html-beautify --editorconfig .editorconfig -r '**/*.html'", "html-beautify": "node_modules/.bin/html-beautify --editorconfig .editorconfig -r '**/*.html'; git add \\*.html",
"beautify-and-build": "npm run html-beautify && npm run build" "beautify-and-build": "npm run html-beautify && npm run build"
}, },
"husky": { "husky": {