diff options
| author | Micah Anderson <micah@riseup.net> | 2013-01-24 16:11:31 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-01-24 16:11:31 -0500 |
| commit | 614ee152c39bbc66c82a52022e2c05aa7856cd4b (patch) | |
| tree | 117fc0f3f61b4362be5dc1f32ab30db445efceb1 /files/boilerplate/providers.header | |
| parent | d3d58a60bb582875a63e78245fb697d18a10877e (diff) | |
| parent | 9e79c7c55755e4cff5097d34c14396fdb0f15f85 (diff) | |
Merge remote-tracking branch 'riseup/master'
Conflicts:
manifests/base.pp
Diffstat (limited to 'files/boilerplate/providers.header')
| -rw-r--r-- | files/boilerplate/providers.header | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files/boilerplate/providers.header b/files/boilerplate/providers.header index c5fb1c5..b4a5990 100644 --- a/files/boilerplate/providers.header +++ b/files/boilerplate/providers.header @@ -6,4 +6,4 @@ # For additional information, see http://shorewall.net/MultiISP.html # ############################################################################################ -#NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY +#NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY |