summaryrefslogtreecommitdiffstats
path: root/tests/ts-fstab-devname
diff options
context:
space:
mode:
authorKarel Zak2007-07-20 14:43:49 +0200
committerKarel Zak2007-07-23 15:04:59 +0200
commit93a024e4dbfa3dce2d6392c01dff151b2cefb765 (patch)
tree1c4e54a9dee10ab19f8a327c3f4def58b8d96cd1 /tests/ts-fstab-devname
parenttests: add license notices, change from gplv2-only to gplv2-or-later (diff)
downloadkernel-qcow2-util-linux-93a024e4dbfa3dce2d6392c01dff151b2cefb765.tar.gz
kernel-qcow2-util-linux-93a024e4dbfa3dce2d6392c01dff151b2cefb765.tar.xz
kernel-qcow2-util-linux-93a024e4dbfa3dce2d6392c01dff151b2cefb765.zip
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>
Diffstat (limited to 'tests/ts-fstab-devname')
-rwxr-xr-xtests/ts-fstab-devname6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/ts-fstab-devname b/tests/ts-fstab-devname
index 68bb21cfd..6ebd9cb79 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"