From a5346ceb70c4089c794ea37432f423618f266ec8 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Wed, 26 Nov 2014 16:12:22 +0100
Subject: [PATCH] Change the pandoradb_data.sql for to avoid the conflict in
 the merge with develop.

---
 pandora_console/pandoradb_data.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 92dadb9d91..8cd266a6e9 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -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'),