From 7cd999d65f02367771868570fd66d0b4bb9d745b Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Fri, 22 Apr 2005 15:53:53 +0000 Subject: [PATCH] two useless files --- conflicts | 8 -------- testfile | 4 ---- 2 files changed, 12 deletions(-) delete mode 100644 conflicts delete mode 100644 testfile 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 @@ - - - -