Change the pandoradb_data.sql for to avoid the conflict in the merge with develop.
This commit is contained in:
parent
352c63087c
commit
e98a2fa535
|
@ -38,7 +38,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
|
|||
('graph_res','5'),
|
||||
('step_compact','1'),
|
||||
('db_scheme_version','6.0dev'),
|
||||
('db_scheme_build','PD141119'),
|
||||
('db_scheme_build','PD141126'),
|
||||
('show_unknown','0'),
|
||||
('show_lastalerts','1'),
|
||||
('style','pandora'),
|
||||
|
|
Loading…
Reference in New Issue