Resolved conflict, indulging new file layout

1 files changed, 0 insertions, 19 deletions

diff --git a/slock/explicit_bzero.c b/slock/explicit_bzero.c
deleted file mode 100644
index 3e33ca8..0000000
--- a/slock/explicit_bzero.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*	$OpenBSD: explicit_bzero.c,v 1.3 2014/06/21 02:34:26 matthew Exp $ */
-/*
- * Public domain.
- * Written by Matthew Dempsky.
- */
-
-#include <string.h>
-
-__attribute__((weak)) void
-__explicit_bzero_hook(void *buf, size_t len)
-{
-}
-
-void
-explicit_bzero(void *buf, size_t len)
-{
-	memset(buf, 0, len);
-	__explicit_bzero_hook(buf, len);
-}