mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
fix conflicts
This commit is contained in:
@@ -49,6 +49,7 @@
|
||||
#include "gui/scan.h"
|
||||
#include "gui/scan_setup.h"
|
||||
#include <zapit/femanager.h>
|
||||
#include <gui/widget/messagebox.h>
|
||||
|
||||
extern int cs_test_card(int unit, char * str);
|
||||
|
||||
|
Reference in New Issue
Block a user