Fix for merge issue for previous pull-request

docker/db/02-smartdata_v1.sql

@@ -11,14 +11,12 @@ CREATE TABLE `counters` (
   `c` int(11) DEFAULT NULL,
   PRIMARY KEY (`domain`),
   KEY `idx_domain` (`domain`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 --
 -- Table structure for table `series`
 --
-DROP TABLE IF EXISTS `rows`;
 DROP TABLE IF EXISTS `series`;
 CREATE TABLE `series` (
-<<<<<<< HEAD
   `id`         bigint unsigned NOT NULL AUTO_INCREMENT,
   `version`    tinyint unsigned NOT NULL,
   `unit`       int unsigned NOT NULL,