From 93a024e4dbfa3dce2d6392c01dff151b2cefb765 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Fri, 20 Jul 2007 14:43:49 +0200
Subject: [PATCH] tests: add license notices, change from gplv2-only to
 gplv2-or-later

The previous "gplv2-only" was copy&past mistake. This re-licensing is
correct -- there is not any other contributor to this code.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/ts-fstab-devname | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/ts-fstab-devname b/tests/ts-fstab-devname
index 68bb21cf..6ebd9cb7 100755
--- a/tests/ts-fstab-devname
+++ b/tests/ts-fstab-devname
@@ -15,14 +15,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-<<<<<<< HEAD:tests/ts-fstab-devname
-
 . ./commands.sh
 . ./functions.sh
-=======
-. commands.sh
-. functions.sh
->>>>>>> tests: add license notices, change from gplv2-only to gplv2-or-later:tests/ts-fstab-devname
 
 TS_COMPONENT="fstab"
 TS_DESC="devname"
-- 
2.39.5