Fix merge problem (#21574)

0e3a7b1a · Erik Sundell · GitHub · 303bbb99 · 0e3a7b1a
Commit 0e3a7b1a authored Jan 17, 2020 by Erik Sundell Committed by GitHub Jan 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

public/app/plugins/datasource/cloudwatch/datasource.ts
+1 -1

No files found.
--- 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(