diff options
| author | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-15 23:58:59 +0200 |
|---|---|---|
| committer | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-15 23:58:59 +0200 |
| commit | db3c6b44d8ba27d032a3c259f8b3a2a9d1c877b5 (patch) | |
| tree | 08d8fc69b42f5dfdbb6c791f712529a3bf8e345d /pages/banners/virusscans.swig | |
| parent | 3a9574bdfff52bc5f8e6b0d94d8f564ff9cf1044 (diff) | |
Revert "Add Expat copyright headers to pages (SWIG)"
This reverts commit 3b4701b240f55b4e97edee7fdc13fec35a76fc5a.
Diffstat (limited to 'pages/banners/virusscans.swig')
| -rw-r--r-- | pages/banners/virusscans.swig | 4 |
1 files changed, 4 insertions, 0 deletions
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> |