fix(lib): merge conflicts

Green-Software-Foundation · Mar 1, 2024 · 983df86 · 983df86
2 parents 8beec6a + 58fe74e
commit 983df86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/__tests__/unit/lib/watt-time/index.test.ts b/src/__tests__/unit/lib/watt-time/index.test.ts
@@ -119,7 +119,7 @@ describe('lib/watt-time: ', () => {
 
       it('throws an error when wrong `geolocation` is provided.', async () => {
         const errorMessage =
-          '"geolocation" parameter is should be a comma-separated string consisting of `latitude` and `longitude`. Error code: invalid_string.';
+          '"geolocation" parameter is not a comma-separated string consisting of `latitude` and `longitude`. Error code: invalid_string.';
         process.env.WATT_TIME_USERNAME = 'test1';
         process.env.WATT_TIME_PASSWORD = 'test2';
 

diff --git a/src/lib/watt-time/index.ts b/src/lib/watt-time/index.ts
@@ -68,7 +68,7 @@ export const WattTimeGridEmissions = (
         .string()
         .regex(new RegExp('^\\-?\\d{1,3}\\.\\d+,-?\\d{1,3}\\.\\d+$'), {
           message:
-            'should be a comma-separated string consisting of `latitude` and `longitude`',
+            'not a comma-separated string consisting of `latitude` and `longitude`',
         }),
     });