last merge change

rokucommunity · Feb 6, 2024 · fdd918a · fdd918a
1 parent ced32dd
commit fdd918a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/util.spec.ts b/src/util.spec.ts
@@ -322,11 +322,7 @@ describe('util', () => {
                 'serial-number': null
             };
 
-<<<<<<< HEAD
-            const result = util.printObjectToTable(deviceInfo);
-=======
             const result = util.objectToTableString(deviceInfo);
->>>>>>> v4
 
             const expectedOutput = [
                 'Name              Value             ',