| #!/bin/sh | |
| # Copyright 2020 Paul Morgan | |
| # License: GPLv2 (https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html) | |
| set -x | |
| set -e | |
| # | |
| # Docker build calls this script to harden the image during build. | |
| # | |
| # NOTE: To build on CircleCI, you must take care to keep the `find` | |
| # command out of the /proc filesystem to avoid errors like: |
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
| # Add correct content-type for fonts | |
| AddType application/vnd.ms-fontobject .eot | |
| AddType font/ttf .ttf | |
| AddType font/otf .otf | |
| AddType font/x-woff .woff | |
| AddType image/svg+xml .svg | |
| # Compress compressible fonts | |
| AddOutputFilterByType DEFLATE font/ttf font/otf image/svg+xml |