diff options
Diffstat (limited to 'pages/banners')
| -rw-r--r-- | pages/banners/donate.swig | 26 | ||||
| -rw-r--r-- | pages/banners/virusscans.swig | 4 |
2 files changed, 4 insertions, 26 deletions
diff --git a/pages/banners/donate.swig b/pages/banners/donate.swig index 6a9b73b..dcd7f7c 100644 --- a/pages/banners/donate.swig +++ b/pages/banners/donate.swig @@ -1,29 +1,3 @@ -{# -Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com> - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -#} - -{# -This template is deprecated since version 2.1.0. It may be removed in a future -release. -#} - <p class="alert alert-info"> <strong>pomf.se is a free service, but our hosting bill isn't</strong> — we need almost $100 a month for that. Donations help keep pomf.se free, online, and fast. Everything (after fees) goes to the hosting bill. <span class="donate-btns"> diff --git a/pages/banners/virusscans.swig b/pages/banners/virusscans.swig index 16a3608..3c5a224 100644 --- a/pages/banners/virusscans.swig +++ b/pages/banners/virusscans.swig @@ -1,3 +1,4 @@ +<<<<<<< HEAD {# Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com> @@ -25,5 +26,8 @@ release. #} <p class="alert alert-info"> +======= +<p class="alert alert-error"> +>>>>>>> parent of 3b4701b... Add Expat copyright headers to pages (SWIG) <strong>Virus scans are now a daily routine</strong> — if a file gets detected it will be removed without further notice. </p> |