From 3a936474cf9a1aa8ef07cbc701fdd5e9cd7954af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Mon, 11 Sep 2017 19:48:46 +0200
Subject: [PATCH] Fix bad merge with master

---
 lib/cartodb/models/dataview/histograms/date-histogram.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cartodb/models/dataview/histograms/date-histogram.js b/lib/cartodb/models/dataview/histograms/date-histogram.js
index fd7e8ba4..e4176146 100644
--- a/lib/cartodb/models/dataview/histograms/date-histogram.js
+++ b/lib/cartodb/models/dataview/histograms/date-histogram.js
@@ -70,8 +70,8 @@ const dateBasicsQueryTpl = ctx => `
 const dateOverrideBasicsQueryTpl = ctx => `
     __cdb_basics AS (
         SELECT
-            max(${ctx._end}) AS __cdb_max_val,
-            min(${ctx._start}) AS __cdb_min_val,
+            max(${ctx._end})::float AS __cdb_max_val,
+            min(${ctx._start})::float AS __cdb_min_val,
             avg(date_part('epoch', ${ctx._column})) AS __cdb_avg_val,
             min(
                 date_trunc(