merge main

code-pushup · Sep 22, 2023 · 5fcb8a8 · 5fcb8a8
2 parents 0a10612 + ef7c8bb
commit 5fcb8a8
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/packages/utils/src/lib/collect/implementation/utils.spec.ts b/packages/utils/src/lib/collect/implementation/utils.spec.ts
@@ -1,6 +1,5 @@
-<<<<<<< HEAD
 import { describe, expect } from 'vitest';
-import { calcDuration, countWeightedRefs, sumRefs } from './utils';
+import { calcDuration, formatBytes, countWeightedRefs, sumRefs } from './utils';
 import { CategoryConfig } from '@quality-metrics/models';
 
 describe('calcDuration', () => {
@@ -59,9 +58,8 @@ describe('sumRefs', () => {
       },
     ];
     expect(sumRefs(refs)).toBe(11);
-=======
-import { describe, expect, it } from 'vitest';
-import { formatBytes } from './utils';
+  });
+});
 
 describe('formatBytes', () => {
   it('should log file sizes in Bytes`', async () => {
@@ -106,6 +104,5 @@ describe('formatBytes', () => {
 
   it('should log file sizes of 0 if no size is given`', async () => {
     expect(formatBytes(0)).toBe('0 Bytes');
->>>>>>> ef7c8bb (feat(utils): test filesize logging)
   });
 });