fix merge

Origin commit data
------------------
Branch: master
Commit: 3eed45f7b1
Author: Frankenstone <dampf_acc@online.de>
Date: 2018-12-25 (Tue, 25 Dec 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Frankenstone
2018-12-25 00:57:24 +01:00
parent bf305b3c93
commit 6f76e14dbe

View File

@@ -40,7 +40,6 @@ typedef struct hw_caps
int display_can_deepstandby;
int display_has_statusline;
int has_button_timer;
int has_button_vformat;
char boxvendor[64];
char boxname[64];
char boxarch[64];