From db3c6b44d8ba27d032a3c259f8b3a2a9d1c877b5 Mon Sep 17 00:00:00 2001
From: Eliot Whalan <ewhal@pantsu.cat>
Date: Thu, 16 Jun 2016 07:58:59 +1000
Subject: Revert "Add Expat copyright headers to pages (SWIG)"

This reverts commit 3b4701b240f55b4e97edee7fdc13fec35a76fc5a.
---
 pages/banners/virusscans.swig | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'pages/banners/virusscans.swig')

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> &mdash; if a file gets detected it will be removed without further notice.
 </p>
-- 
cgit v1.2.3