Resolve merge conflicts

2019-06-10 19:08:35 -04:00
parent 56f32b2d66 84dc82ce10
commit 2740c13bad
2 changed files with 43 additions and 2 deletions
--- a/types.ts
+++ b/types.ts
@@ -68,4 +68,4 @@ export interface WateringData {
    raining: boolean;
 }

-export type WeatherProviderId = "OWM" | "DarkSky" | "local";
+export type WeatherProviderId = "OWM" | "DarkSky" | "local" | "mock";