From 0e3a7b1a6fc4eccd4db5f001a54ae95482183eaa Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.sundell@grafana.com>
Date: Fri, 17 Jan 2020 15:30:54 +0100
Subject: [PATCH] Fix merge problem (#21574)

---
 public/app/plugins/datasource/cloudwatch/datasource.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index c098697fb79..2eeb5b06c80 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -139,7 +139,7 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery,
       }
     }
 
-    return period;
+    return period || '';
   }
 
   buildCloudwatchConsoleUrl(