fix-conflict

Signed-off-by: Shan He <heshan0131@gmail.com>
keplergl · Jan 6, 2020 · c999520 · c999520
1 parent dd8d7aa
commit c999520
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test/helpers/comparison-utils.js b/test/helpers/comparison-utils.js
@@ -209,12 +209,8 @@ export function cmpDataset(t, expectedDataset, actualDataset, opt = {}) {
         cmpField(
           t,
           expectedDataset.fields[i],
-<<<<<<< HEAD
           actualField,
           `dataset.${expectedDataset.id} fields ${actualField.name}`
-=======
-          `dataset.${expectedDataset.id}.${key} fields ${actualField.name} should be the same`
->>>>>>> [Feat] Gpu data filtering - 5 (#858)
         );
       });
     } else if (key === 'gpuFilter') {