From f026be3790b3af69c968e0ac7c5cf2b2fc6c6ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 13 Nov 2018 15:23:13 +0100
Subject: [PATCH] fix case where timeshift and time override is used

---
 public/app/features/dashboard/utils/panel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/features/dashboard/utils/panel.ts b/public/app/features/dashboard/utils/panel.ts
index 831d4e0396f..6e0138eeec8 100644
--- a/public/app/features/dashboard/utils/panel.ts
+++ b/public/app/features/dashboard/utils/panel.ts
@@ -140,7 +140,7 @@ export const applyPanelTimeOverrides = (
     }
 
     const timeShift = '-' + timeShiftInterpolated;
-    newTimeData.timeInfo = ' timeshift ' + timeShift;
+    newTimeData.timeInfo += ' timeshift ' + timeShift;
     newTimeData.timeRange = {
       from: dateMath.parseDateMath(timeShift, timeRange.from, false),
       to: dateMath.parseDateMath(timeShift, timeRange.to, true),