From 09097170a2ff5dc85d5f06e18780e44e9dd77701 Mon Sep 17 00:00:00 2001
From: Pavel P <pavlov.pavel@gmail.com>
Date: Thu, 6 Feb 2020 18:25:34 +0600
Subject: [PATCH] Fixed merge issues (spurious trailing spaces)

---
 conf.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf.h b/conf.h
index 5e57fc6..a648409 100644
--- a/conf.h
+++ b/conf.h
@@ -254,4 +254,3 @@ struct _PACKED doubleu   { double             d; };
 #define die(fmt,args...) do { fprintf(stderr, "%s:%s:%d:", __FILE__, __FUNCTION__, __LINE__); fprintf(stderr, fmt, ## args ); fflush(stderr); exit(-1); } while(0)
     #endif
   #endif
-