diff options
| author | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-16 03:00:45 +0200 |
|---|---|---|
| committer | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-16 03:00:45 +0200 |
| commit | 74f98a50adfbe10dd000a3e4d4c1189baae42d04 (patch) | |
| tree | 534e06da72c7166d09ee408a1032ddd8819b76ef /pages/banners | |
| parent | e4f3f8668175cb77818783ac21f4e77f132e62c9 (diff) | |
Resolve missed revert conflict
Diffstat (limited to 'pages/banners')
| -rw-r--r-- | pages/banners/virusscans.swig | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/pages/banners/virusscans.swig b/pages/banners/virusscans.swig index 3c5a224..1de0f92 100644 --- a/pages/banners/virusscans.swig +++ b/pages/banners/virusscans.swig @@ -1,33 +1,3 @@ -<<<<<<< HEAD -{# -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"> -======= <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> |