diff options
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> |