Fix merge problem (#21574)

6 years ago · 0e3a7b1a6f
parent 303bbb9900
commit 0e3a7b1a6f
1 changed files with 1 additions and 1 deletions
--- 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(