Resolved conflict, indulging new file layout

1 files changed, 0 insertions, 17 deletions

diff --git a/oldresources/st/patch/xresources.h b/oldresources/st/patch/xresources.h
deleted file mode 100644
index c184852..0000000
--- a/oldresources/st/patch/xresources.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <X11/Xresource.h>
-
-/* Xresources preferences */
-enum resource_type {
-	STRING = 0,
-	INTEGER = 1,
-	FLOAT = 2
-};
-
-typedef struct {
-	char *name;
-	enum resource_type type;
-	void *dst;
-} ResourcePref;
-
-int resource_load(XrmDatabase, char *, enum resource_type, void *);
-void config_init(Display *dpy);