two useless files

diff --git a/conflicts b/conflicts
deleted file mode 100644 (file)
index 1291136..0000000
--- 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 (file)
index fd40910..0000000
--- a/testfile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-