From: Ben Gras <ben@minix3.org>
Date: Fri, 22 Apr 2005 15:53:53 +0000 (+0000)
Subject: two useless files
X-Git-Tag: v3.1.0~904
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/addsub.png?a=commitdiff_plain;h=7cd999d65f02367771868570fd66d0b4bb9d745b;p=minix.git

two useless files
---

diff --git a/conflicts b/conflicts
deleted file mode 100644
index 12911369f..000000000
--- a/conflicts
+++ /dev/null
@@ -1,8 +0,0 @@
-./Makefile
-./commands/ash/test/malloc.c
-./servers/fs/const.h
-./servers/fs/main.c
-./servers/fs/mount.c
-./servers/fs/protect.c
-./servers/fs/read.c
-./servers/mm/misc.c
diff --git a/testfile b/testfile
deleted file mode 100644
index fd40910d9..000000000
--- a/testfile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-