Resolved conflict, indulging new file layout

1 files changed, 0 insertions, 9 deletions

diff --git a/dmenu/util.h b/dmenu/util.h
deleted file mode 100644
index c0a50d4..0000000
--- a/dmenu/util.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#define MAX(A, B)               ((A) > (B) ? (A) : (B))
-#define MIN(A, B)               ((A) < (B) ? (A) : (B))
-#define BETWEEN(X, A, B)        ((A) <= (X) && (X) <= (B))
-#define LENGTH(X)               (sizeof (X) / sizeof (X)[0])
-
-void die(const char *fmt, ...);
-void *ecalloc(size_t nmemb, size_t size);